Merge branch 'master' of github.com:spf13/hugo
authorbep <bjorn.erik.pedersen@gmail.com>
Mon, 19 Jan 2015 01:41:16 +0000 (02:41 +0100)
committerbep <bjorn.erik.pedersen@gmail.com>
Mon, 19 Jan 2015 01:41:16 +0000 (02:41 +0100)
commit109e6f95fdbb809b0a2759a06a1aac9d1cacc9b3
tree7964daee705b75e15697b6d16f5604d76eaf245e
parent73d923e95d8ca5c59dea4da920693ead1649f0ab
parent1dfd0225e3628eca40a264377f5083c1480fdef0
Merge branch 'master' of github.com:spf13/hugo