Merge remote-tracking branch 'origin/master'
authorKenneth Reitz <me@kennethreitz.com>
Sat, 15 Dec 2012 10:50:05 +0000 (05:50 -0500)
committerKenneth Reitz <me@kennethreitz.com>
Sat, 15 Dec 2012 10:50:05 +0000 (05:50 -0500)
commit12aa40188505d756e64aed7cd314aaffed16120d
tree8f4f0ac4bf3c3ec2bcfc6a9ed8609ff8b4809c28
parent92d57036f3805f1c6a7ff97758c0f70d17bd7191
parent58c10edb07e6b9314ae008ff9faafc052b71d9cb
Merge remote-tracking branch 'origin/master'