Merge branch 'development' into release
authorLars Op den Kamp <lars@opdenkamp.eu>
Tue, 9 Oct 2012 11:17:25 +0000 (13:17 +0200)
committerLars Op den Kamp <lars@opdenkamp.eu>
Tue, 9 Oct 2012 11:17:25 +0000 (13:17 +0200)

Trivial merge