Merge branch 'develop' of github.com:JohnPeacockMessageSystems/requests into develop
authorJohn Peacock <jpeacock@messagesystems.com>
Wed, 21 Nov 2012 18:41:39 +0000 (13:41 -0500)
committerJohn Peacock <jpeacock@messagesystems.com>
Wed, 21 Nov 2012 18:41:39 +0000 (13:41 -0500)

Trivial merge