Merge remote-tracking branch 'origin/develop' into develop
authorKenneth Reitz <me@kennethreitz.com>
Fri, 9 Dec 2011 21:23:26 +0000 (13:23 -0800)
committerKenneth Reitz <me@kennethreitz.com>
Fri, 9 Dec 2011 21:23:26 +0000 (13:23 -0800)

Trivial merge