Merge branch 'master' into release
authorLars Op den Kamp <lars@opdenkamp.eu>
Sat, 9 Mar 2013 14:51:31 +0000 (15:51 +0100)
committerLars Op den Kamp <lars@opdenkamp.eu>
Sat, 9 Mar 2013 14:51:31 +0000 (15:51 +0100)

Trivial merge