Merge remote-tracking branch 'origin/develop' into develop
authorKenneth Reitz <me@kennethreitz.com>
Sun, 26 Feb 2012 04:15:54 +0000 (23:15 -0500)
committerKenneth Reitz <me@kennethreitz.com>
Sun, 26 Feb 2012 04:15:54 +0000 (23:15 -0500)

Trivial merge