Merge branch 'master' of github.com:spf13/hugo
authorspf13 <steve.francia@gmail.com>
Sat, 10 Aug 2013 01:07:35 +0000 (02:07 +0100)
committerspf13 <steve.francia@gmail.com>
Sat, 10 Aug 2013 01:07:35 +0000 (02:07 +0100)
commit733c0207cb855d2d4a5130bc469c662e50b61d59
tree251646ed6ab9a4f25bd0f11ced5f7bee24e9cc5e
parenta870f4d95571b4ba19048b1ec1310d3ef3f2f9aa
parent2bf24877a6111cd575927896c14482ae9ba675af
Merge branch 'master' of github.com:spf13/hugo

Conflicts:
hugolib/site.go
hugolib/site.go