Merge branch 'master' into release
authorLars Op den Kamp <lars@opdenkamp.eu>
Mon, 6 Aug 2012 10:35:16 +0000 (12:35 +0200)
committerLars Op den Kamp <lars@opdenkamp.eu>
Mon, 6 Aug 2012 10:35:16 +0000 (12:35 +0200)

Trivial merge