Merge branch 'master' of github.com:spf13/hugo
authorspf13 <steve.francia@gmail.com>
Sat, 31 Jan 2015 06:04:28 +0000 (01:04 -0500)
committerspf13 <steve.francia@gmail.com>
Sat, 31 Jan 2015 06:04:28 +0000 (01:04 -0500)
commite1e6aaed2f57d682f99a478c5602117ae27707eb
tree8e89b5713772c36570c51a22c8399375b31a99ef
parent8db3c0b0a677a6b122ad5a396ee52b074acb7e87
parent4a9436c116776ad3b776f9c16a816c878bccd4f3
Merge branch 'master' of github.com:spf13/hugo
hugolib/page.go
hugolib/shortcode.go