Merge branch 'development'. closes #67
authorLars Op den Kamp <lars@opdenkamp.eu>
Mon, 15 Oct 2012 12:11:32 +0000 (14:11 +0200)
committerLars Op den Kamp <lars@opdenkamp.eu>
Mon, 15 Oct 2012 12:11:35 +0000 (14:11 +0200)

Trivial merge