Merge remote branch 'origin/1.0.x' into 1.0.x
authorEvan Prodromou <evan@status.net>
Thu, 17 Mar 2011 19:28:18 +0000 (15:28 -0400)
committerEvan Prodromou <evan@status.net>
Thu, 17 Mar 2011 19:28:18 +0000 (15:28 -0400)
commit558bfb8c86ef378429d2d5d592cba371d3f5cc4b
treeb0dbba1c54301d46e8b5096e4e13169c14a4acc3
parent60a237ac624e99f7066986f973b4fcbba05a5b49
parent0d30dff6d6daffcc93b1ca43bfc348d3f38572f2
Merge remote branch 'origin/1.0.x' into 1.0.x