Merge remote-tracking branch 'origin/develop' into develop
authorKenneth Reitz <me@kennethreitz.com>
Thu, 15 Mar 2012 00:27:02 +0000 (20:27 -0400)
committerKenneth Reitz <me@kennethreitz.com>
Thu, 15 Mar 2012 00:27:02 +0000 (20:27 -0400)

Trivial merge