Merge commit 'refs/merge-requests/164' of...
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.
Showing
Please register or sign in to comment