Merge branch 'master' into social-master
authorRoland Haeder <roland@mxchange.org>
Sun, 8 Mar 2015 23:38:02 +0000 (00:38 +0100)
committerRoland Haeder <roland@mxchange.org>
Sun, 8 Mar 2015 23:38:08 +0000 (00:38 +0100)
Signed-off-by: Roland Haeder <roland@mxchange.org>

Trivial merge