Merge branch 'master' of github.com:spf13/hugo
authorspf13 <steve.francia@gmail.com>
Mon, 16 Feb 2015 16:51:32 +0000 (11:51 -0500)
committerspf13 <steve.francia@gmail.com>
Mon, 16 Feb 2015 16:51:32 +0000 (11:51 -0500)

Trivial merge