Merge remote-tracking branch 'origin/1.2.x' into 1.2.x
authorEvan Prodromou <evan@status.net>
Wed, 4 Jul 2012 18:10:47 +0000 (14:10 -0400)
committerEvan Prodromou <evan@status.net>
Wed, 4 Jul 2012 18:10:47 +0000 (14:10 -0400)
commit27f0efab8ac11c7d885291a9b322af3d88e37c03
tree613810746d54bdc8e35e49f09c80f3a4e3352386
parent93a3c1276a110900615222467b23d19659a590a7
parent2e9119b2906379e1c6e9cee3bb3402782690574d
Merge remote-tracking branch 'origin/1.2.x' into 1.2.x