Merge remote-tracking branch 'origin/develop' into develop
authorKenneth Reitz <me@kennethreitz.com>
Fri, 12 Oct 2012 23:45:20 +0000 (00:45 +0100)
committerKenneth Reitz <me@kennethreitz.com>
Fri, 12 Oct 2012 23:45:20 +0000 (00:45 +0100)
commitc3fc2dd2594faea5797ef6cdd75d0ae31b5ec1d6
treeb83be1006a8e5901b49920199729899838a5b16f
parentf33a0aa47b049994e41188e6101cf79c4a2d5d4b
parent0c0254453f30bee79145f2798ff16505e05b90d0
Merge remote-tracking branch 'origin/develop' into develop