Merge branch 'master' of github.com:spf13/hugo
authorspf13 <steve.francia@gmail.com>
Sat, 9 Nov 2013 06:17:40 +0000 (01:17 -0500)
committerspf13 <steve.francia@gmail.com>
Sat, 9 Nov 2013 06:17:40 +0000 (01:17 -0500)

Trivial merge