Merge branch 'master' of GitHub.com:spf13/hugo
authorspf13 <steve.francia@gmail.com>
Wed, 20 May 2015 22:48:33 +0000 (18:48 -0400)
committerspf13 <steve.francia@gmail.com>
Wed, 20 May 2015 22:48:33 +0000 (18:48 -0400)
commitbdb187e482e14c6b8502caf41d1c4c3bcbbb57b0
treee50f27e4a6b9e138144d680f5d987b81cd97bfdd
parenta584ff207b4ee951e4b25cf5cedf6d261ee1bc47
parentbe0262786e55bb2dbfda334603cc28f2fc30f403
Merge branch 'master' of GitHub.com:spf13/hugo
hugolib/shortcode_test.go