Merge branch 'dev'
authorThomas Heck <theck@linet-services.de>
Thu, 7 Mar 2013 10:21:04 +0000 (11:21 +0100)
committerThomas Heck <theck@linet-services.de>
Thu, 7 Mar 2013 10:21:04 +0000 (11:21 +0100)

Trivial merge