Merge branch '1.0.x' of git@gitorious.org:statusnet/mainline into 1.0.x
authorZach Copley <zach@status.net>
Thu, 14 Apr 2011 22:29:11 +0000 (22:29 +0000)
committerZach Copley <zach@status.net>
Thu, 14 Apr 2011 22:29:11 +0000 (22:29 +0000)
commitbef1ed75b5e0bf11d824eabc2d2ac79ffbec9fcf
tree3921e009480e63fd5e07710002bf6e2afa2f1911
parent7224ca571cb955cfb1f14f5917bec852664b990b
parent3d9dc111a2afe2bdbd41d8360e9e3f97d926b1c5
Merge branch '1.0.x' of git@gitorious.org:statusnet/mainline into 1.0.x