Merge branch 'new-layout' into cobleebuilder
authorMaran <maran.hidskes@gmail.com>
Wed, 1 Aug 2012 19:01:42 +0000 (21:01 +0200)
committerMaran <maran.hidskes@gmail.com>
Wed, 1 Aug 2012 19:01:42 +0000 (21:01 +0200)
commit3e6342cae79f5d15240f53a253d24e12de984668
treebdf4b011ecc5c471b43a48cb9515065bb8a7b1c0
parentd9c8a2472c988f288e8b07e1c45c5b3663f741c1
parent57cc413edc23cd8a357aeb248b27198000ac367c
Merge branch 'new-layout' into cobleebuilder