From: Michael Vogel Date: Sat, 10 Jan 2015 23:51:14 +0000 (+0100) Subject: Merge remote-tracking branch 'upstream/develop' into 1501-poci-with-location X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=f6ee51bcd7727202205b2e41cd7faef30803fd85;p=friendica.git Merge remote-tracking branch 'upstream/develop' into 1501-poci-with-location --- f6ee51bcd7727202205b2e41cd7faef30803fd85