Merge branch 'newlayout' into newlayout-stage
authorJef van Schendel <mail@jefvanschendel.nl>
Sun, 4 Mar 2012 18:05:41 +0000 (19:05 +0100)
committerJef van Schendel <mail@jefvanschendel.nl>
Sun, 4 Mar 2012 18:05:41 +0000 (19:05 +0100)
commit822d37176e51ce1d56c4ce8eed6948118ef8281a
treefc1f34e04634715ce9adaeb4f770e4ef70ab8044
parentb8e635b22f9647b173b9320ebb6539bdefe851d8
parentee9a0e3c78a621b09a04914e53906d36a635899f
Merge branch 'newlayout' into newlayout-stage