Merge remote-tracking branch 'origin/develop' into develop
authorKenneth Reitz <me@kennethreitz.com>
Tue, 27 Nov 2012 04:50:09 +0000 (20:50 -0800)
committerKenneth Reitz <me@kennethreitz.com>
Tue, 27 Nov 2012 04:50:09 +0000 (20:50 -0800)

Trivial merge