Merge branch 'development'
authorLars Op den Kamp <lars@opdenkamp.eu>
Thu, 6 Dec 2012 19:48:32 +0000 (20:48 +0100)
committerLars Op den Kamp <lars@opdenkamp.eu>
Thu, 6 Dec 2012 19:48:32 +0000 (20:48 +0100)

Trivial merge