Merge branch '0.8.x' of git@gitorious.org:statusnet/mainline into 0.8.x
authorEvan Prodromou <evan@status.net>
Tue, 17 Nov 2009 16:00:10 +0000 (11:00 -0500)
committerEvan Prodromou <evan@status.net>
Tue, 17 Nov 2009 16:00:10 +0000 (11:00 -0500)
commitf63e00d4a2bf99101084f73c7ab1f4ec0301e97d
treeb41ae1762a7e8740f3ebedfa88368121664ca4b5
parent18e61e631bac89e420af4bba1dc9f3cf51196c17
parent55025986db72a1dce02e8e8c4d1a5d22185d2361
Merge branch '0.8.x' of git@gitorious.org:statusnet/mainline into 0.8.x