Merge remote-tracking branch 'origin/develop' into develop
authorKenneth Reitz <me@kennethreitz.com>
Fri, 18 Nov 2011 20:34:37 +0000 (15:34 -0500)
committerKenneth Reitz <me@kennethreitz.com>
Fri, 18 Nov 2011 20:34:37 +0000 (15:34 -0500)
commitcf60062df19c853769bb542ee92b30f77dd77ca4
tree063127264980bd95f0a747ee04b58d00e832c37f
parentc70b7bb01224811dce17d7135f636639a37c98c7
parent82a5f1dd9bfb9dc1c390bce9d57d68f50cd8c3df
Merge remote-tracking branch 'origin/develop' into develop