Merge remote-tracking branch 'origin'
authorEvan Prodromou <evan@status.net>
Mon, 9 Jul 2012 13:33:42 +0000 (09:33 -0400)
committerEvan Prodromou <evan@status.net>
Mon, 9 Jul 2012 13:33:42 +0000 (09:33 -0400)
commitdad72cce28866d7a95926d97378c20aa3eff9150
tree659c66e6a6c76900ea78764bf3f7603d12e43a69
parentd5564fb8d826019d4cd969b8b2d5a16e5e5ef3df
parentc7ad7bce9fcc36435f1ca856ba2bbc38ff0e9d48
Merge remote-tracking branch 'origin'