Merge remote-tracking branch 'upstream/master' into social-master
authorRoland Haeder <roland@mxchange.org>
Sat, 4 Jul 2015 00:37:49 +0000 (02:37 +0200)
committerRoland Haeder <roland@mxchange.org>
Sat, 4 Jul 2015 00:37:49 +0000 (02:37 +0200)

Trivial merge