Merge remote-tracking branch 'origin/develop' into develop
authorKenneth Reitz <me@kennethreitz.com>
Fri, 8 Jun 2012 01:55:11 +0000 (21:55 -0400)
committerKenneth Reitz <me@kennethreitz.com>
Fri, 8 Jun 2012 01:55:11 +0000 (21:55 -0400)
commit8bfbfdfc79224fa51775351efb4f937e1c9f0437
tree41f2d74fb8f69355a5b1031a5c62dd48f75dd2c7
parent843672f4fe1158fc21e2bdabba44c178707766a1
parent89266f90625ca91590de6e86bcd776127af28db1
Merge remote-tracking branch 'origin/develop' into develop