Merge branch '1.1.x'
authorEvan Prodromou <evan@status.net>
Fri, 6 Jul 2012 14:47:00 +0000 (10:47 -0400)
committerEvan Prodromou <evan@status.net>
Fri, 6 Jul 2012 14:47:00 +0000 (10:47 -0400)
commit0c6ca3ec415df1324666ceb85950ec730b943500
tree0acccaf941784a356a1960d0c554a68983ec3398
parent3ffe2e3f03a87293f607ad38cc1ba084dec23c14
parent8cd1bdc686ce5a685a56f0c72ee5c03c6c744a2d
Merge branch '1.1.x'