Merge branch '1.0.x' into testing
authorEvan Prodromou <evan@status.net>
Tue, 5 Apr 2011 17:47:49 +0000 (13:47 -0400)
committerEvan Prodromou <evan@status.net>
Tue, 5 Apr 2011 17:47:49 +0000 (13:47 -0400)
commit03ad3f69cc35a86a9a41e8cc9144cb0591e1392a
tree8ea3c6bc81b1e59b86e006ef566fad674288d348
parentc9ca11eb647450ab552a4608545981bf3e907092
parentd09995561dc2b63dc63d537fce922237bfbde9f1
Merge branch '1.0.x' into testing