Merge branch 'master' into release
authorLars Op den Kamp <lars@opdenkamp.eu>
Tue, 15 May 2012 10:31:27 +0000 (12:31 +0200)
committerLars Op den Kamp <lars@opdenkamp.eu>
Tue, 15 May 2012 10:31:27 +0000 (12:31 +0200)

Trivial merge