Merge branch 'master' of gitorious.org:statusnet/mainline 0.9.7
authorEvan Prodromou <evan@status.net>
Thu, 17 Mar 2011 13:59:46 +0000 (09:59 -0400)
committerEvan Prodromou <evan@status.net>
Thu, 17 Mar 2011 13:59:46 +0000 (09:59 -0400)
commit9a4660522794f05427b2d48f659575a0dfc90762
tree110a0a146e77f80342ba8ae990784e8f56461066
parent531400be6f3cba904eaa20dbd62fea45a6090877
parente985a41a7ee56a81bbc3150cbb2abb9cf69b0d8a
Merge branch 'master' of gitorious.org:statusnet/mainline