Merge branch '0.9.x' of git@gitorious.org:statusnet/mainline into 0.9.x
authorEvan Prodromou <evan@status.net>
Mon, 11 Jan 2010 08:45:51 +0000 (00:45 -0800)
committerEvan Prodromou <evan@status.net>
Mon, 11 Jan 2010 08:45:51 +0000 (00:45 -0800)
commit4afa1ce4f3e9ef7f4939843905cce76e88f9a73f
tree4e012e3ef2fcebb5bb2982d9cc04379892510577
parent8809e577b2c8cf1b8b187840aaf9674136929ec7
parentf182d613aadaf488b99b080e1e034d86803cec57
Merge branch '0.9.x' of git@gitorious.org:statusnet/mainline into 0.9.x