Merge pull request #1062 from philfreo/patch-2
authorKenneth Reitz <me@kennethreitz.com>
Sat, 22 Dec 2012 22:10:17 +0000 (14:10 -0800)
committerKenneth Reitz <me@kennethreitz.com>
Sat, 22 Dec 2012 22:10:17 +0000 (14:10 -0800)
commit22a1f0917baf70f3c598737ae50c8846a96eec5c
treebfd3d6905e972aa0f31b8ec2b4f89ff28699ec52
parente23343ab17c7ab41d8f741724cc84c54963fb90f
parent78f48aef8f494f9e85f747a9c1045e7fb78ffc67
Merge pull request #1062 from philfreo/patch-2

Using 'master' branch for development