Merge remote-tracking branch 'origin/master'
authorEvan Prodromou <evan@status.net>
Wed, 4 Jul 2012 17:22:58 +0000 (13:22 -0400)
committerEvan Prodromou <evan@status.net>
Wed, 4 Jul 2012 17:22:58 +0000 (13:22 -0400)
commit24ecb42f0e8c87ff30c2518db1ed8f3dd0ece20c
treec85b809281ed276c7ae510ffbf850a1aac6584fd
parentfee9ddf84115bfa1062d7661fd439c5f8ddf985e
parentd4ea76a6ae0bd21fffeb24db394827210d6f17c2
Merge remote-tracking branch 'origin/master'