Merge branch '1.1.x'
authorEvan Prodromou <evan@status.net>
Tue, 3 Jul 2012 19:42:51 +0000 (15:42 -0400)
committerEvan Prodromou <evan@status.net>
Tue, 3 Jul 2012 19:42:51 +0000 (15:42 -0400)
commitb1ccf10d0940535bf9afce632e96e3316060678d
treea4473b1597d625a54c29e238e40f50fc915c8f6d
parent88ce08ca8254823a3df40f8621ce446bb175f7f2
parent98d108598717b7d73702b5389de50712424219f6
Merge branch '1.1.x'