Merge branch '1.0.x' of gitorious.org:statusnet/mainline into 1.0.x
authorEvan Prodromou <evan@status.net>
Sat, 9 Apr 2011 19:38:39 +0000 (15:38 -0400)
committerEvan Prodromou <evan@status.net>
Sat, 9 Apr 2011 19:38:39 +0000 (15:38 -0400)
commit8b46624d19b7d95045c355f116e5d6ca66776e1c
tree7f75b0cd41acbe918bd46f5c93b5b952126b9d66
parent070b07632b6490c204b3819eaa4cfe258bf31918
parent5a377a24c9d6327ecf70279d5649443cba66b9ce
Merge branch '1.0.x' of gitorious.org:statusnet/mainline into 1.0.x