Merge branch 'testing' of git@gitorious.org:statusnet/mainline into testing
authorZach Copley <zach@status.net>
Fri, 5 Feb 2010 02:08:37 +0000 (02:08 +0000)
committerZach Copley <zach@status.net>
Fri, 5 Feb 2010 02:08:37 +0000 (02:08 +0000)
commit8d320d7cc2998a4977c5de4ba571ea4f95b21dce
treeeb8903c9a07126b88e4112de5d83a22dba2a1073
parent10dfcde0b2099a169ccd3af0ecfbf2de9da551d6
parent509c8fc51589a4cc6a3281e012ce759ab9bed532
Merge branch 'testing' of git@gitorious.org:statusnet/mainline into testing
classes/statusnet.ini