Merge branch 'master' into 0.8.x
authorEvan Prodromou <evan@status.net>
Mon, 9 Nov 2009 22:43:45 +0000 (17:43 -0500)
committerEvan Prodromou <evan@status.net>
Mon, 9 Nov 2009 22:43:45 +0000 (17:43 -0500)
commit8bcc58a9894e715dc1cb39eeb390bf8deefc13b7
tree04781c6d251466b84035f478f995e4eeb6cad951
parenta0a9c7bcbf2d0cd041e9ada136213816600a7d84
parent499b3555df2a3c27f56f2931b3add15192fef1fc
Merge branch 'master' into 0.8.x

Conflicts:
scripts/updateavatarurl.php