Merge pull request #1037 from sigmavirus24/master
authorKenneth Reitz <me@kennethreitz.com>
Tue, 18 Dec 2012 18:09:33 +0000 (10:09 -0800)
committerKenneth Reitz <me@kennethreitz.com>
Tue, 18 Dec 2012 18:09:33 +0000 (10:09 -0800)
commit4966d9c7141a9e1c43242a45cd5b29d8224a0bc6
tree7f45c3460ae0973be42756b436136c35bf2ba39c
parent6acce57271efce8c17cea2f1eece943f429e3879
parent14da5cf180c4776f6a4aeeb8a6979ee885fc8c82
Merge pull request #1037 from sigmavirus24/master

Fix #1036