Merge branch 'master' of gitorious.org:social/mainline
authorRoland Haeder <roland@mxchange.org>
Tue, 10 Mar 2015 23:18:33 +0000 (00:18 +0100)
committerRoland Haeder <roland@mxchange.org>
Tue, 10 Mar 2015 23:19:08 +0000 (00:19 +0100)
commite8d1bb25469fe1ef0cbcb32c3022010997aca4b0
treeeb9b0cc748f780b95bcee6acb87398f53ec287ab
parentfd3d46d07da49eeeaedce406e30344a8bf0b7e6a
parent5a3a3420e3c40baf36f2e9464d421ea9d8464f5a
Merge branch 'master' of gitorious.org:social/mainline

Signed-off-by: Roland Haeder <roland@mxchange.org>