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

This commit is contained in:
Roland Haeder 2016-03-01 18:29:34 +01:00
commit 6318d28435
No known key found for this signature in database
GPG Key ID: B72F8185C6C7BD78

Diff Content Not Available