Merge pull request #1080 from sigmavirus24/master
authorKenneth Reitz <me@kennethreitz.com>
Mon, 7 Jan 2013 18:42:30 +0000 (10:42 -0800)
committerKenneth Reitz <me@kennethreitz.com>
Mon, 7 Jan 2013 18:42:30 +0000 (10:42 -0800)
commitb4505284f2e8145e46e398c494b25b44a3bd03b4
treec629ef180686deefea5049f9c8e89f56ad08276f
parent47fe258b5a318b50f1c1a1069104e8eb699d6491
parent5264c71d86c078f60b9880cc0f481c7fea2b41db
Merge pull request #1080 from sigmavirus24/master

Fix #1079