Merge remote-tracking branch 'origin/develop' into develop
authorKenneth Reitz <me@kennethreitz.com>
Sun, 25 Mar 2012 19:26:58 +0000 (15:26 -0400)
committerKenneth Reitz <me@kennethreitz.com>
Sun, 25 Mar 2012 19:26:58 +0000 (15:26 -0400)

Trivial merge