]> git.mxchange.org Git - quix0rs-gnu-social.git/commitdiff
Merge branch '0.9.x' of git@gitorious.org:statusnet/mainline into 0.9.x
authorEvan Prodromou <evan@status.net>
Tue, 17 Nov 2009 11:25:07 +0000 (06:25 -0500)
committerEvan Prodromou <evan@status.net>
Tue, 17 Nov 2009 11:25:07 +0000 (06:25 -0500)
Conflicts:
classes/statusnet.ini


No differences found