Merge remote-tracking branch 'origin/master'

Author Arne Rantzen <www.arne@web.de>
Author date 2014-08-05 16:59:10
Author local date 2014-08-05 18:59:10 +0200
Committer Arne Rantzen <www.arne@web.de>
Committer date 2014-08-05 16:59:10
Committer local date 2014-08-05 18:59:10 +0200
Commit 534659265ca436311c4a675583e656c62b25ab76
Tree 20f57e678a4542b6d96f3e6ea55bb7c760067e01
Parent 3e2f4ca30c90e17de5ed36a4be7480c670864b0f
Parent 12f7c2b250efbbcdb4bfd3841985c434f8bace36
Merge remote-tracking branch 'origin/master'