Merge branch 'master' of github.com:spf13/hugo
authorspf13 <steve.francia@gmail.com>
Mon, 5 Aug 2013 23:10:10 +0000 (01:10 +0200)
committerspf13 <steve.francia@gmail.com>
Mon, 5 Aug 2013 23:10:10 +0000 (01:10 +0200)

Trivial merge