From: bep <bjorn.erik.pedersen@gmail.com>
Date: Mon, 19 Jan 2015 09:05:22 +0000 (+0100)
Subject: Merge branch 'master' of github.com:spf13/hugo
X-Git-Tag: v0.13~167
X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=3c4bc653;p=brevno-suite%2Fhugo

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

3c4bc653a3b95e14cb8f45dd5183d0f4071d0bb1