Merge remote-tracking branch 'origin/develop' into develop
authorKenneth Reitz <me@kennethreitz.com>
Fri, 9 Dec 2011 21:23:26 +0000 (13:23 -0800)
committerKenneth Reitz <me@kennethreitz.com>
Fri, 9 Dec 2011 21:23:26 +0000 (13:23 -0800)
commit961f78ab5f41c1ad87dad3ad120c3568282e6b8c
tree7b5d9a2ff7e9fc3f359880c1f68d9f14d05924ac
parent463ca76cc44f5ae2ee15e217e0ffa5305ef14ae5
parentf58ab8bc033baf55b5d996340ba4a2cf5cdabdfb
Merge remote-tracking branch 'origin/develop' into develop