Merge remote-tracking branch 'origin/develop' into develop
authorKenneth Reitz <me@kennethreitz.com>
Fri, 15 Jun 2012 18:31:24 +0000 (14:31 -0400)
committerKenneth Reitz <me@kennethreitz.com>
Fri, 15 Jun 2012 18:31:24 +0000 (14:31 -0400)
commitf5d1d0d27a47e2f8abe9fb267ca7f4c6a96f1d76
tree090f3e74f41f25c20824f5229227c23db5111bbc
parentd3acb783b95623d0378db02bd9832fb11850204b
parent08ac9897bb2cbc0e8c9cd42792de2ea12a7203a7
Merge remote-tracking branch 'origin/develop' into develop