Merge branch 'master' into dev
authorThomas Heck <theck@linet-services.de>
Wed, 27 Feb 2013 13:44:58 +0000 (14:44 +0100)
committerThomas Heck <theck@linet-services.de>
Wed, 27 Feb 2013 13:44:58 +0000 (14:44 +0100)

Trivial merge