Merge remote-tracking branch 'origin/master'

Author Arne Rantzen <www.arne@web.de>
Author date 2014-08-05 17:33:48
Author local date 2014-08-05 19:33:48 +0200
Committer Arne Rantzen <www.arne@web.de>
Committer date 2014-08-05 17:33:48
Committer local date 2014-08-05 19:33:48 +0200
Commit c160f649f8d10c679d1f0d9b1f3dd5a807104a18
Tree ef798afb0aac836f967d706b53b208b40f82a965
Parent 8ec73d6759a5ca07acb36651626db1acc6b59e04
Parent 77bbae70f9ffd7a274001e77c209a363db48fc0a
Merge remote-tracking branch 'origin/master'