From: Simon L'nu <simon.lnu@gmail.com>
Date: Sat, 19 May 2012 06:59:40 +0000 (-0400)
Subject: Merge branch 'master', remote-tracking branch 'remotes/upstream/master'
X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=2cee9ec5c830098b5c57ae0c3d2a3d4e6697bce2;p=friendica.git

Merge branch 'master', remote-tracking branch 'remotes/upstream/master'

* remotes/upstream/master:
  profile change activity link bug

* master:
---

2cee9ec5c830098b5c57ae0c3d2a3d4e6697bce2