Merge branch '0.8.x' of git@gitorious.org:statusnet/mainline into 0.8.x
authorEvan Prodromou <evan@status.net>
Mon, 1 Feb 2010 16:48:33 +0000 (11:48 -0500)
committerEvan Prodromou <evan@status.net>
Mon, 1 Feb 2010 16:48:33 +0000 (11:48 -0500)
commit6c3bc028fa6a49f51be28dfa387b978be97e1460
tree6ae0c95165b82b4c58ea0496f0b6d2c34b503f8f
parent45c1516217af42c62fbf1d69cb795939a473ef02
parent3af689f71bcc974fdbc698e05f6926e566886057
Merge branch '0.8.x' of git@gitorious.org:statusnet/mainline into 0.8.x