Merge remote branch 'gitorious/1.0.x' into 1.0.x
authorEvan Prodromou <evan@status.net>
Tue, 12 Oct 2010 15:16:32 +0000 (11:16 -0400)
committerEvan Prodromou <evan@status.net>
Tue, 12 Oct 2010 15:16:32 +0000 (11:16 -0400)
commit4580d6065cb6917f356d86693689e429f21d01f7
treeb523a3762a4a5c08963906e6f5a8ace6bbec9d42
parent8aa9c271dffe6ec6766b94486c0635c9db588db7
parentaa02f6020e16f722d5194ad97e66a57ab1d8c29c
Merge remote branch 'gitorious/1.0.x' into 1.0.x