Merge branch 'dev'
authorThomas Heck <theck@linet-services.de>
Wed, 12 Dec 2012 15:07:29 +0000 (16:07 +0100)
committerThomas Heck <theck@linet-services.de>
Wed, 12 Dec 2012 15:07:29 +0000 (16:07 +0100)

Trivial merge