Merge remote-tracking branch 'origin/master'

Author Arne Rantzen <www.arne@web.de>
Author date 2014-08-10 00:53:26
Author local date 2014-08-10 02:53:26 +0200
Committer Arne Rantzen <www.arne@web.de>
Committer date 2014-08-10 00:53:26
Committer local date 2014-08-10 02:53:26 +0200
Commit e73fc3dca9eb04d44711fd8f95c23aabcca6656e
Tree 5bb28ccaf6d7f828ead02b67d2449a7b04f0dd12
Parent e0641854a76fcd50c8a05e3df0104e41f39e5f67
Parent 5d9d41d25733132bff11a10262e51be7f3b905ae
Merge remote-tracking branch 'origin/master'