Merge remote-tracking branch 'origin/master'
authorKenneth Reitz <me@kennethreitz.com>
Thu, 24 Oct 2013 14:54:48 +0000 (10:54 -0400)
committerKenneth Reitz <me@kennethreitz.com>
Thu, 24 Oct 2013 14:54:48 +0000 (10:54 -0400)
commit7b5c11f66bf22a31f1ee32999c5bb460caaa1be5
treea8e09257383301415b2c42af7f19dd1df5ae9a88
parentafa7594a2064dd019c968e42ec708561a992c433
parent6e52b5fe41f68a47059b7720cf5737c392220bce
Merge remote-tracking branch 'origin/master'