Merge branch '0.8.x' of git@gitorious.org:statusnet/mainline into 0.8.x
authorEvan Prodromou <evan@status.net>
Mon, 9 Nov 2009 22:46:48 +0000 (17:46 -0500)
committerEvan Prodromou <evan@status.net>
Mon, 9 Nov 2009 22:46:48 +0000 (17:46 -0500)
commit18e61e631bac89e420af4bba1dc9f3cf51196c17
tree46a6e692afaf582c38a3856ca69f1b990eb438eb
parent8bcc58a9894e715dc1cb39eeb390bf8deefc13b7
parent3a2af8da24ae472f8c81fcafe20f2f48f8963a13
Merge branch '0.8.x' of git@gitorious.org:statusnet/mainline into 0.8.x