Merge branch '1.0.x' of gitorious.org:statusnet/mainline into 1.0.x
authorEvan Prodromou <evan@status.net>
Wed, 6 Apr 2011 21:57:57 +0000 (17:57 -0400)
committerEvan Prodromou <evan@status.net>
Wed, 6 Apr 2011 21:57:57 +0000 (17:57 -0400)
commit402c0654ea1a91be6e45c4bfbbfed64a31f1f505
treeb3d760b5aff43f746364781251f4a20c2c6fb430
parent4b5f76d688fee47585aec0b3d0c92d0af8c0225b
parent512bd91deed74b2cb567d5c0afe10514423e46db
Merge branch '1.0.x' of gitorious.org:statusnet/mainline into 1.0.x