Merge branch '0.8.x' of git@gitorious.org:statusnet/mainline into 0.8.x
authorEvan Prodromou <evan@status.net>
Wed, 23 Sep 2009 13:29:02 +0000 (09:29 -0400)
committerEvan Prodromou <evan@status.net>
Wed, 23 Sep 2009 13:29:02 +0000 (09:29 -0400)
commitc01a5b8f2e37fe876507edfccc01126a117d9728
tree93090403212c52e75a717730791917b1cc6f8fa0
parente80fad7ad9bd0bee6a9cf4cfd1615a9b07277364
parentacd5a53257f6d0677d1630e4f6cae80706cdbdba
Merge branch '0.8.x' of git@gitorious.org:statusnet/mainline into 0.8.x