Merge branch '1.1.x'
authorEvan Prodromou <evan@status.net>
Mon, 9 Jul 2012 13:46:45 +0000 (09:46 -0400)
committerEvan Prodromou <evan@status.net>
Mon, 9 Jul 2012 13:46:45 +0000 (09:46 -0400)
commitb4dbd23ed21fdd530ece52011403e49e762e365d
tree78902f7a179469c0bd6a8770298931be9c3271e4
parent78a8eb5b6ebac0afe3e899990860c6f18c013f52
parent9034148e0d1fdab17b210ebaf3f0d92693429637
Merge branch '1.1.x'