Merge branch 'develop' of github.com:apotheos/requests into develop
authorMichael Holler <mjholler@noctrl.edu>
Thu, 14 Jun 2012 14:15:18 +0000 (09:15 -0500)
committerMichael Holler <mjholler@noctrl.edu>
Thu, 14 Jun 2012 14:15:18 +0000 (09:15 -0500)

Trivial merge