Merge branch '0.9.x' of gitorious.org:statusnet/mainline into 0.9.x
authorBrion Vibber <brion@pobox.com>
Fri, 25 Feb 2011 20:24:18 +0000 (12:24 -0800)
committerBrion Vibber <brion@pobox.com>
Fri, 25 Feb 2011 20:24:18 +0000 (12:24 -0800)
commit534bed9d74682d1e21c5b2a8a406f264b4bade26
tree8a876b8b85e06cf977c4a7f2d720f630f7fde1f4
parent052ae2d88a8582f6e24eeb8203d426c77d8ac47e
parent7f50315168338a76c02072ba64ea9f326b5c2729
Merge branch '0.9.x' of gitorious.org:statusnet/mainline into 0.9.x