Merge remote-tracking branch 'origin/develop' into develop
authorKenneth Reitz <me@kennethreitz.com>
Sat, 12 Nov 2011 15:28:26 +0000 (07:28 -0800)
committerKenneth Reitz <me@kennethreitz.com>
Sat, 12 Nov 2011 15:28:26 +0000 (07:28 -0800)
commit30ed6643d71e8adbe5b5553de5c0f14e77bb0705
tree3a6610c1317f8f1d80a5599d56cc9f014aa11974
parent1588ad7c469b61cbfc8185e3d7326dff79afa81e
parentd9798f4a3c9d21b074e4ccd3cde31217b9b6afdc
Merge remote-tracking branch 'origin/develop' into develop