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)
1  2 
hugolib/shortcode_test.go

Simple merge