Merge branch 'master' into release
authorLars Op den Kamp <lars@opdenkamp.eu>
Thu, 3 Nov 2011 23:15:11 +0000 (00:15 +0100)
committerLars Op den Kamp <lars@opdenkamp.eu>
Thu, 3 Nov 2011 23:15:11 +0000 (00:15 +0100)

Trivial merge