From: Michael Vogel Date: Sat, 5 Sep 2015 10:13:38 +0000 (+0200) Subject: Merge branch '1509-diaspora-import' of github.com:annando/friendica into 1509-diaspor... X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=6aac9dfc9c16cf18650e0eceb1ad31c14932ec3b;p=friendica.git Merge branch '1509-diaspora-import' of github.com:annando/friendica into 1509-diaspora-import --- 6aac9dfc9c16cf18650e0eceb1ad31c14932ec3b