Merge remote-tracking branch 'origin/master'
authorKenneth Reitz <me@kennethreitz.com>
Wed, 12 Dec 2012 21:53:44 +0000 (16:53 -0500)
committerKenneth Reitz <me@kennethreitz.com>
Wed, 12 Dec 2012 21:53:44 +0000 (16:53 -0500)
commit7e47d5ef30164859b7f7b50b9a6d77bba951883a
tree573a76f83f0cb6a19ec32da740f37f9cf2f758d6
parent584cfb664d72d3e9f1f2a5f2ed205ad8356fb5c1
parentd74bd7e1a28eb80cd9dba1a0d149f35dd35ab3e0
Merge remote-tracking branch 'origin/master'