Merge branch 'new-layout' into cobleebuilder
authorMaran <maran.hidskes@gmail.com>
Thu, 2 Aug 2012 14:16:59 +0000 (16:16 +0200)
committerMaran <maran.hidskes@gmail.com>
Thu, 2 Aug 2012 14:16:59 +0000 (16:16 +0200)

Trivial merge