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)
commit3c4bc653a3b95e14cb8f45dd5183d0f4071d0bb1
tree53dc0f26fad79f549a76262b3b95d1d4e9337306
parent783c76b86ef883097a11b4c2a7dfde884bea966c
parent5d6dfe81b8c78d86fad677b4ba452b7bcf52aed9
Merge branch 'master' of github.com:spf13/hugo