Merge branch 'master' of github.com:spf13/hugo
authorbep <bjorn.erik.pedersen@gmail.com>
Mon, 19 Jan 2015 09:05:22 +0000 (10:05 +0100)
committerbep <bjorn.erik.pedersen@gmail.com>
Mon, 19 Jan 2015 09:05:22 +0000 (10:05 +0100)

Trivial merge