Merge remote-tracking branch 'upstream/master' into social-master
authorRoland Haeder <roland@mxchange.org>
Mon, 1 Jun 2015 02:18:51 +0000 (04:18 +0200)
committerRoland Haeder <roland@mxchange.org>
Mon, 1 Jun 2015 02:18:51 +0000 (04:18 +0200)

Trivial merge