Merge branch '0.8.x' of git@gitorious.org:statusnet/mainline into 0.8.x
authorEvan Prodromou <evan@status.net>
Thu, 24 Sep 2009 21:14:38 +0000 (17:14 -0400)
committerEvan Prodromou <evan@status.net>
Thu, 24 Sep 2009 21:14:38 +0000 (17:14 -0400)
commitdfff99ecc8f54465c1af806adaa77fb98744ce3d
treed8e85821dfa2226742ccb78c6de52b65c6661424
parentd7e43c732efe2e3b6b4827c4d2286bc03507a31c
parent5323956e388ebc2e4dfa1a5193aa670c96fff027
Merge branch '0.8.x' of git@gitorious.org:statusnet/mainline into 0.8.x