Merge branch 'master' of github.com:spf13/hugo
authorspf13 <steve.francia@gmail.com>
Sat, 9 Nov 2013 06:17:40 +0000 (01:17 -0500)
committerspf13 <steve.francia@gmail.com>
Sat, 9 Nov 2013 06:17:40 +0000 (01:17 -0500)
commitb69694a3aefbf6ddfbf110de29dbb26c7976eff4
treee20ef136df86917fe62e51a08c2c3b6f4f71151f
parent532e2e7b931e852c6c96711ba2e6eaea8911d7b7
parent0b6a11c9e3cf2493caf6aad6f5759223679ccdbb
Merge branch 'master' of github.com:spf13/hugo