Merge remote-tracking branch 'origin/develop' into develop
authorKenneth Reitz <me@kennethreitz.com>
Sat, 31 Mar 2012 03:15:47 +0000 (23:15 -0400)
committerKenneth Reitz <me@kennethreitz.com>
Sat, 31 Mar 2012 03:15:47 +0000 (23:15 -0400)

Trivial merge