Merge branch '0.9.x' of gitorious.org:statusnet/mainline into 0.9.x
authorEvan Prodromou <evan@status.net>
Thu, 17 Mar 2011 15:32:37 +0000 (11:32 -0400)
committerEvan Prodromou <evan@status.net>
Thu, 17 Mar 2011 15:32:37 +0000 (11:32 -0400)
commit1a666f07129837cfed420ea54e0f57e2b13f8815
tree1845ea155e4497d9fa8c6509a54b75cd56923d9f
parenta4305401557f56656d98e1bb22dd68e83a5622c7
parent1d7f54ee386c667e3d373bb7dd1dbed31d996391
Merge branch '0.9.x' of gitorious.org:statusnet/mainline into 0.9.x