From: Simon L'nu Date: Mon, 5 Mar 2012 06:08:54 +0000 (-0500) Subject: Merge branch 'master', remote-tracking branch 'remotes/upstream/master' X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=7de79a8c49e1cf601c0408883a02c6f6a13cd0db;p=friendica.git Merge branch 'master', remote-tracking branch 'remotes/upstream/master' * remotes/upstream/master: like dislike button fixes in diabook * master: --- 7de79a8c49e1cf601c0408883a02c6f6a13cd0db