Merge branch 'master' into release
authorLars Op den Kamp <lars@opdenkamp.eu>
Sun, 19 Feb 2012 10:30:15 +0000 (11:30 +0100)
committerLars Op den Kamp <lars@opdenkamp.eu>
Sun, 19 Feb 2012 10:30:15 +0000 (11:30 +0100)

Trivial merge