Merge branch 'master' of gitorious.org:social/mainline
authorRoland Haeder <roland@mxchange.org>
Wed, 4 Mar 2015 13:52:41 +0000 (14:52 +0100)
committerRoland Haeder <roland@mxchange.org>
Wed, 4 Mar 2015 13:52:46 +0000 (14:52 +0100)
commitb8bca62e3b4b139fac5d1bb69bf683882b799d86
treeb8636232ab2b03ba48e293758be5c1b07dd00fa7
parent1269e3f22315ab7bb2d4c355fb8b655f2db41b0b
parent5c6b98e821b5ad30fc0aa2e92e57c7cd95730c2e
Merge branch 'master' of gitorious.org:social/mainline

Signed-off-by: Roland Haeder <roland@mxchange.org>
lib/framework.php