merged trunk changes into branch
authormartin.holst@gmail.com <martin.holst@gmail.com@ef4ab9da-24cd-11de-8aaa-f3a34680c41f>
Mon, 16 Sep 2013 19:08:19 +0000 (19:08 +0000)
committermartin.holst@gmail.com <martin.holst@gmail.com@ef4ab9da-24cd-11de-8aaa-f3a34680c41f>
Mon, 16 Sep 2013 19:08:19 +0000 (19:08 +0000)

Trivial merge
Impressum, Datenschutz