Merge commit 'refs/merge-requests/2223' of git://gitorious.org/statusnet/mainline...
authorZach Copley <zach@status.net>
Mon, 25 Oct 2010 21:35:56 +0000 (14:35 -0700)
committerZach Copley <zach@status.net>
Mon, 25 Oct 2010 21:35:56 +0000 (14:35 -0700)
commit307c819089146a83ae3b8f3c21be692cd6297c19
tree4eb85f9d495b80c8dbd596475cfa6a041035a8e2
parent1a1ca22aca8ab0524413fb41e195adab068a2b42
parent0243cea82bb41460a1f0bb2ea3c5fef157ec67bb
Merge commit 'refs/merge-requests/2223' of git://gitorious.org/statusnet/mainline into integration