Merge branch 'master' of github.com:spf13/hugo
authorspf13 <steve.francia@gmail.com>
Wed, 14 Aug 2013 14:19:59 +0000 (10:19 -0400)
committerspf13 <steve.francia@gmail.com>
Wed, 14 Aug 2013 14:19:59 +0000 (10:19 -0400)
1  2 
hugolib/site.go

diff --cc hugolib/site.go
Simple merge