Merge remote-tracking branch 'origin/develop' into develop
authorKenneth Reitz <me@kennethreitz.com>
Sat, 12 Nov 2011 15:28:26 +0000 (07:28 -0800)
committerKenneth Reitz <me@kennethreitz.com>
Sat, 12 Nov 2011 15:28:26 +0000 (07:28 -0800)

Trivial merge