Merge branch '1.1.x' master
authorEvan Prodromou <evan@status.net>
Fri, 7 Sep 2012 14:29:55 +0000 (10:29 -0400)
committerEvan Prodromou <evan@status.net>
Fri, 7 Sep 2012 14:29:55 +0000 (10:29 -0400)
commitba7e73ee979b99ed53c030e8a64eebc7f229db45
treed16779b64ae07211ff7fb7aca6e87c93b6a50154
parent9b97adc7adf3deb6ac977a286191455f22ce2c6d
parentf21881d5faddd56f57f52dc1a1f699c3dc9518e3
Merge branch '1.1.x'