Merge branch '0.9.x' into 1.0.x
authorEvan Prodromou <evan@status.net>
Fri, 3 Sep 2010 02:57:37 +0000 (22:57 -0400)
committerEvan Prodromou <evan@status.net>
Fri, 3 Sep 2010 02:57:37 +0000 (22:57 -0400)
commit326258bfef7282509d719238234038d0f6a8d3ff
tree43c51335d817bcb02af3b0cae50e8f8e5449e6e9
parent6f540f963b6b9c5355b3fc89c9b14146d90d6a6e
parent6c14235d6c3359a6c9012ec49077f8defe117779
Merge branch '0.9.x' into 1.0.x