Merge branch 'master' into release
authorLars Op den Kamp <lars@opdenkamp.eu>
Thu, 28 Feb 2013 18:43:59 +0000 (19:43 +0100)
committerLars Op den Kamp <lars@opdenkamp.eu>
Thu, 28 Feb 2013 18:43:59 +0000 (19:43 +0100)

Trivial merge