Merge branch 'design'
commit2c17efe4f831b2bdea191eec1083b076db89a3d9
authorStefan Kögl <stefan@skoegl.net>
Mon, 3 Sep 2012 17:14:43 +0000 (3 19:14 +0200)
committerStefan Kögl <stefan@skoegl.net>
Mon, 3 Sep 2012 17:14:43 +0000 (3 19:14 +0200)
tree7b8294554c1025b29d0e4c80a69231c443cc7584
parent92745c24e09ed7d4aebf1503781a2a0f1e847be7
parenta81010b2e67c2caf75dd12eb7a6bc2c3e1193051
Merge branch 'design'