Merge branch 'release'
authorLars Op den Kamp <lars@opdenkamp.eu>
Fri, 4 Nov 2011 08:02:57 +0000 (09:02 +0100)
committerLars Op den Kamp <lars@opdenkamp.eu>
Fri, 4 Nov 2011 08:02:57 +0000 (09:02 +0100)

Trivial merge