From: Zach Copley Date: Fri, 19 Mar 2010 00:20:09 +0000 (-0700) Subject: Merge branch 'testing' of gitorious.org:statusnet/mainline into testing X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=1f160bb7bc62d8672a4e600ab73fdddffd188194;p=quix0rs-gnu-social.git Merge branch 'testing' of gitorious.org:statusnet/mainline into testing * 'testing' of gitorious.org:statusnet/mainline: Handle "forgot to upload an avatar on avatarsettings" a little more gracefully. --- 1f160bb7bc62d8672a4e600ab73fdddffd188194