Merge remote-tracking branch 'origin/develop' into develop
authorKenneth Reitz <me@kennethreitz.com>
Wed, 25 Jan 2012 16:26:08 +0000 (11:26 -0500)
committerKenneth Reitz <me@kennethreitz.com>
Wed, 25 Jan 2012 16:26:08 +0000 (11:26 -0500)
commit5ca5b7ec65793bd508ccd1655329f6442649823f
treed7fd5cea82edad644c477d30aadb2319e3b5e789
parent2b202aabd7f7e3b7150603e7aa1097ef97379cae
parentcb64d311719e627df0f78c8446d40326899206c3
Merge remote-tracking branch 'origin/develop' into develop