Merge branch 'master' of github.com:spf13/hugo
authorspf13 <steve.francia@gmail.com>
Tue, 13 Aug 2013 14:47:58 +0000 (10:47 -0400)
committerspf13 <steve.francia@gmail.com>
Tue, 13 Aug 2013 14:47:58 +0000 (10:47 -0400)
commit6e27239485ffd83b33b743fef53efffd63f0826c
treeae2b94118439cd3e7b3350585b70497b8ef5ac26
parentec02fa4bddaf07d392671497c31c8136763d78f7
parentca5a94a98866a664fb68be06b609537a619a19ea
Merge branch 'master' of github.com:spf13/hugo