Merge branch 'master' into release
authorLars Op den Kamp <lars@opdenkamp.eu>
Thu, 6 Dec 2012 22:46:06 +0000 (23:46 +0100)
committerLars Op den Kamp <lars@opdenkamp.eu>
Thu, 6 Dec 2012 22:46:06 +0000 (23:46 +0100)

Trivial merge