From: Simon L'nu Date: Fri, 27 Apr 2012 06:28:44 +0000 (-0400) Subject: Merge branch 'master', remote-tracking branch 'remotes/upstream/master' X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=bd1b38381d460e1912f620b25ce3c17a9879822b;p=friendica.git Merge branch 'master', remote-tracking branch 'remotes/upstream/master' * remotes/upstream/master: reset qcomment selector after insert. put fakelink back in birthday notice birthday contact link goes to event page instead of remote profile make comment edit icons look more like base theme rev update * master: ---