Merge remote-tracking branch 'origin/master' v1.2.2
authorKenneth Reitz <me@kennethreitz.com>
Tue, 21 May 2013 21:43:53 +0000 (17:43 -0400)
committerKenneth Reitz <me@kennethreitz.com>
Tue, 21 May 2013 21:43:53 +0000 (17:43 -0400)
commit00ab8fbfea52795e5f40b18d4707a9799fcd0688
tree17aea6eb7563900697ffb354c015581e206447a6
parent9930c9c737f8d7469fceb3a503f333675123668b
parent2ee814d9245b591cbfcc03c385148cdcfbb29723
Merge remote-tracking branch 'origin/master'