Merge branch 'master', remote-tracking branch 'origin'
authorEvan Prodromou <evan@status.net>
Wed, 16 Nov 2011 16:56:02 +0000 (11:56 -0500)
committerEvan Prodromou <evan@status.net>
Wed, 16 Nov 2011 16:56:02 +0000 (11:56 -0500)
commite2c65d72aebdedf5439f84833db9fcb63a81dd2b
tree3caa3c006a71cd46670bd4b1e6c57e6605986469
parentcab76836cb97c3bc36f6efa74c045f0c2d12c49e
Merge branch 'master', remote-tracking branch 'origin'