Merge branch '1.0.x' of gitorious.org:statusnet/mainline into 1.0.x
authorEvan Prodromou <evan@status.net>
Fri, 8 Apr 2011 21:09:15 +0000 (17:09 -0400)
committerEvan Prodromou <evan@status.net>
Fri, 8 Apr 2011 21:09:15 +0000 (17:09 -0400)
commit8cb0d7e708cfe81f3161c7238f7c873efb1c38a4
tree96221588c1b744b1d7c14d1990c1b62d3063b460
parentaf02de01e57ae8f89c3c941d29e2ad9b28a7ccae
parent8335d234f7b8e75a1ecd3bd8a072effe6afd0fb3
Merge branch '1.0.x' of gitorious.org:statusnet/mainline into 1.0.x