Merge branch '1.0.x' of gitorious.org:statusnet/mainline into 1.0.x oscon
authorEvan Prodromou <evan@status.net>
Tue, 26 Jul 2011 18:52:05 +0000 (11:52 -0700)
committerEvan Prodromou <evan@status.net>
Tue, 26 Jul 2011 18:52:05 +0000 (11:52 -0700)
commit8844b373b415629209aaa2b71c4eb44e9bf083d0
treef587b5d4e47d56dc69ce8408d79bf706b8ec99a6
parent0ec3047e0cacb4547ab1cd6da571f69fa06a4481
parent7fcdc1a9ed9262978a3b613d58ccca600e353071
Merge branch '1.0.x' of gitorious.org:statusnet/mainline into 1.0.x