Merge branch 'master' into release
authorLars Op den Kamp <lars@opdenkamp.eu>
Thu, 17 May 2012 12:31:23 +0000 (14:31 +0200)
committerLars Op den Kamp <lars@opdenkamp.eu>
Thu, 17 May 2012 12:31:23 +0000 (14:31 +0200)

Trivial merge