Merge branch 'rhaeder-develop' of github.com:Quix0r/friendica into rhaeder-develop

Signed-off-by: Roland Haeder <roland@mxchange.org>
This commit is contained in:
Roland Haeder 2016-03-01 18:31:33 +01:00
commit 95bfa17254
No known key found for this signature in database
GPG key ID: B72F8185C6C7BD78

Diff content is not available