Merge branch 'develop' of https://github.com/gerhard6380/friendica into develop
authorgerhard6380 <gerhard@seeber.at>
Fri, 23 Sep 2016 17:38:57 +0000 (19:38 +0200)
committergerhard6380 <gerhard@seeber.at>
Fri, 23 Sep 2016 17:38:57 +0000 (19:38 +0200)
commit528a492282b42b269579fc5fa7d7bd958c3808a0
tree1c8ab28c2f56f5cc5efd163882177c75d12b15cb
parentc0aac548274d463c611a9c0317fa6ec7d205a30e
parentafc7d316a72fe3d50d1fdd6cf099a3f375c493a9
Merge branch 'develop' of https://github.com/gerhard6380/friendica into develop