Merge branch 'master' into release
authorLars Op den Kamp <lars@opdenkamp.eu>
Mon, 13 May 2013 13:09:14 +0000 (15:09 +0200)
committerLars Op den Kamp <lars@opdenkamp.eu>
Mon, 13 May 2013 13:09:14 +0000 (15:09 +0200)

Trivial merge