Merge branch 'master' into testing
authorEvan Prodromou <evan@status.net>
Sun, 18 Sep 2011 22:34:33 +0000 (18:34 -0400)
committerEvan Prodromou <evan@status.net>
Sun, 18 Sep 2011 22:34:33 +0000 (18:34 -0400)
commit0503bcb0e2dd75de10a74ee5fc12d1523a44b028
tree867f6ac395836c6a074d13f429d6d9ca7461bbdc
parente1129f34d505a0dcfa28ce765c5005ee44d242e3
parent48625da04b8ab5865c31aef38033b94bf8cfa983
Merge branch 'master' into testing