From: Evan Prodromou Date: Wed, 21 Sep 2011 19:39:44 +0000 (-0400) Subject: Merge commit 'refs/merge-requests/164' of git://gitorious.org/statusnet/mainline... X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=59043dca7fb6f974b11797c4d0f20e5b78b0611d;p=quix0rs-gnu-social.git Merge commit 'refs/merge-requests/164' of git://gitorious.org/statusnet/mainline into merge-requests/164 Conflicts: classes/Avatar.php I ignored the code in Avatar; it's a different patch. --- 59043dca7fb6f974b11797c4d0f20e5b78b0611d