Merge branch 'master' into release
authorLars Op den Kamp <lars@opdenkamp.eu>
Sat, 17 Nov 2012 02:33:33 +0000 (03:33 +0100)
committerLars Op den Kamp <lars@opdenkamp.eu>
Sat, 17 Nov 2012 02:33:33 +0000 (03:33 +0100)

Trivial merge