Merge branch '0.8.x' of git@gitorious.org:~evan/statusnet/evans-mainline into 0.8.x
authorEvan Prodromou <evan@status.net>
Sat, 9 Jan 2010 01:33:22 +0000 (17:33 -0800)
committerEvan Prodromou <evan@status.net>
Sat, 9 Jan 2010 01:33:22 +0000 (17:33 -0800)
commit5c36e29e7fd2f41ff5533d181047f1a86ad8a20a
treeee5947d19042e8bb231c5c707e166c601d669c77
parentf63e00d4a2bf99101084f73c7ab1f4ec0301e97d
parent0a586f0d1e9326dfd88ccf62bc9a00071d565664
Merge branch '0.8.x' of git@gitorious.org:~evan/statusnet/evans-mainline into 0.8.x