Merge branch 'rhaeder-develop' of github.com:Quix0r/friendica into rhaeder-develop
authorRoland Haeder <roland@mxchange.org>
Tue, 1 Mar 2016 17:31:33 +0000 (18:31 +0100)
committerRoland Haeder <roland@mxchange.org>
Tue, 1 Mar 2016 17:31:33 +0000 (18:31 +0100)
commit95bfa17254e655af74e6cbe7a93785be011b2d62
tree4308186d4824d74107308ba7fac212facad9e4d9
parent6318d284353ad48ddf58a9208fd9fc0966d4d647
parent7e485f25ab0fee428f159d91f2b958173d02f26c
Merge branch 'rhaeder-develop' of github.com:Quix0r/friendica into rhaeder-develop

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