Merge branch 'master' of github.com:spf13/hugo
authorspf13 <steve.francia@gmail.com>
Tue, 13 Aug 2013 14:47:58 +0000 (10:47 -0400)
committerspf13 <steve.francia@gmail.com>
Tue, 13 Aug 2013 14:47:58 +0000 (10:47 -0400)

Trivial merge