Merge remote-tracking branch 'origin/master'
authorKenneth Reitz <me@kennethreitz.com>
Sun, 31 Mar 2013 05:28:57 +0000 (08:28 +0300)
committerKenneth Reitz <me@kennethreitz.com>
Sun, 31 Mar 2013 05:28:57 +0000 (08:28 +0300)

Trivial merge