3551: Merge branch 'master' into 3551-go-layout
authorTom Clegg <tom@curoverse.com>
Wed, 13 Aug 2014 19:13:43 +0000 (15:13 -0400)
committerTom Clegg <tom@curoverse.com>
Wed, 13 Aug 2014 19:13:43 +0000 (15:13 -0400)
1  2 
doc/_config.yml

diff --cc doc/_config.yml
Simple merge