Merge branch 'rhaeder-develop' of github.com:Quix0r/friendica into rhaeder-develop
authorRoland Haeder <roland@mxchange.org>
Tue, 1 Mar 2016 17:32:21 +0000 (18:32 +0100)
committerRoland Haeder <roland@mxchange.org>
Tue, 1 Mar 2016 17:32:21 +0000 (18:32 +0100)
commit902a3fdfe99d8ed183abc082b3e2a81c3f74ef16
tree4308186d4824d74107308ba7fac212facad9e4d9
parent2d154ae72fef27c846c570fd0f362376dd5e10b1
parent95bfa17254e655af74e6cbe7a93785be011b2d62
Merge branch 'rhaeder-develop' of github.com:Quix0r/friendica into rhaeder-develop