]> git.mxchange.org Git - quix0rs-gnu-social.git/commit
Merge branch '0.8.x' into 0.9.x
authorEvan Prodromou <evan@status.net>
Mon, 2 Nov 2009 23:11:45 +0000 (18:11 -0500)
committerEvan Prodromou <evan@status.net>
Mon, 2 Nov 2009 23:11:45 +0000 (18:11 -0500)
commit61419038e5747886357964a7eb3f814761482891
treef61943a99d81a84992e49e2afaca6effdf8e295d
parentc991047fc4d3a1a231311e26519803f9bb2111dc
parent01795bd615a67d6ad71b3b8240e0151f4c90a374
Merge branch '0.8.x' into 0.9.x

Conflicts:
README
README
classes/User.php