Merge remote-tracking branch 'origin/master'

Author Arne Rantzen <www.arne@web.de>
Author date 2014-08-13 22:13:27
Author local date 2014-08-14 00:13:27 +0200
Committer Arne Rantzen <www.arne@web.de>
Committer date 2014-08-13 22:13:27
Committer local date 2014-08-14 00:13:27 +0200
Commit 70f0a4fc2bb080fea22be2c1f169fc71f968e936
Tree 1d61f7f24cd047b3f6dd3f1ef82e31c2482ff881
Parent bd30f342dbf2581903a46f0b151ed949bb762c31
Parent 0b3656b10c8ccc160adce657c2fa666d65b9dd2d
Merge remote-tracking branch 'origin/master'