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)

Trivial merge