Merge branch 'master' into social-master
authorRoland Haeder <roland@mxchange.org>
Thu, 5 Mar 2015 22:50:51 +0000 (23:50 +0100)
committerRoland Haeder <roland@mxchange.org>
Thu, 5 Mar 2015 22:50:58 +0000 (23:50 +0100)
Signed-off-by: Roland Haeder <roland@mxchange.org>

Trivial merge