Merge branch 'master' of github.com:spf13/hugo
authorspf13 <steve.francia@gmail.com>
Mon, 16 Feb 2015 16:51:32 +0000 (11:51 -0500)
committerspf13 <steve.francia@gmail.com>
Mon, 16 Feb 2015 16:51:32 +0000 (11:51 -0500)
commitd33a42f1d1be93a592c2127eca03acaf83b39dd3
tree1b4aa41d65c3dd54683ecfc80c6d085147390e68
parentf1fec88c308631ab9618b9a2b6dba9c714b087c1
parent159836ed2df46fb8eb26ba395d8011aad42ae209
Merge branch 'master' of github.com:spf13/hugo