]> git.mxchange.org Git - quix0rs-gnu-social.git/commitdiff
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)
Conflicts:
scripts/updateavatarurl.php


Trivial merge