From: spf13 <steve.francia@gmail.com>
Date: Wed, 20 May 2015 22:48:33 +0000 (-0400)
Subject: Merge branch 'master' of GitHub.com:spf13/hugo
X-Git-Tag: v0.14~30
X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=bdb187e4;p=brevno-suite%2Fhugo

Merge branch 'master' of GitHub.com:spf13/hugo
---

bdb187e482e14c6b8502caf41d1c4c3bcbbb57b0