Merge branch 'master' into social-master
authorRoland Haeder <roland@mxchange.org>
Wed, 4 Mar 2015 13:52:59 +0000 (14:52 +0100)
committerRoland Haeder <roland@mxchange.org>
Wed, 4 Mar 2015 13:53:08 +0000 (14:53 +0100)
Signed-off-by: Roland Haeder <roland@mxchange.org>

Trivial merge