Merge branch 'master' into 3219-further-docker-improvements
authorWard Vandewege <ward@curoverse.com>
Mon, 28 Jul 2014 22:46:15 +0000 (00:46 +0200)
committerWard Vandewege <ward@curoverse.com>
Mon, 28 Jul 2014 22:46:15 +0000 (00:46 +0200)
1  2 
doc/install/index.html.textile.liquid

Simple merge