Merge remote-tracking branch 'gitorious/1.0.x' into 1.0.x
authorEvan Prodromou <evan@status.net>
Wed, 6 Apr 2011 18:23:53 +0000 (14:23 -0400)
committerEvan Prodromou <evan@status.net>
Wed, 6 Apr 2011 18:23:53 +0000 (14:23 -0400)
commit17c8df76f1eb5fa5ad0518dfd6c63df150647cd6
tree6c18e324d738f38b1f23fda6344e4e5bab5cb653
parentb85c4923a21c9082bb14ed2edf24c8b8c827f0a3
parentb541443370583afb8c08cdac175d49b98565150c
Merge remote-tracking branch 'gitorious/1.0.x' into 1.0.x