Merge branch 'redirect' of https://github.com/rozza/hugo into rozza-redirect
authorspf13 <steve.francia@gmail.com>
Sat, 10 Aug 2013 13:08:38 +0000 (14:08 +0100)
committerspf13 <steve.francia@gmail.com>
Sat, 10 Aug 2013 13:08:38 +0000 (14:08 +0100)
commit45ce6e2b309dc247315885db4de4d03192b93914
treee8826e0544fbb1ff5fe26ebda80d7ce66c41d4d7
parent733c0207cb855d2d4a5130bc469c662e50b61d59
parente2a28114d196689337fea8a78f250c7ef706b4be
Merge branch 'redirect' of https://github.com/rozza/hugo into rozza-redirect

Conflicts:
hugolib/page.go
hugolib/page.go