Merge branch 'master' into develop
authorKenneth Reitz <me@kennethreitz.com>
Wed, 19 Oct 2011 20:36:12 +0000 (16:36 -0400)
committerKenneth Reitz <me@kennethreitz.com>
Wed, 19 Oct 2011 20:36:12 +0000 (16:36 -0400)
commit5568f77ad5005ae623eba85567d12e01cd6f4500
tree3a4186435329c0d4a12c722a8e5f952f1bdcea18
parentcfd38263d1a8b3c6754c261a93d842fd5090deb8
parent23efd56b126b85eed98c6ca481e167e8e9612ebd
Merge branch 'master' into develop