Merge remote-tracking branch 'origin/develop' into develop
authorKenneth Reitz <me@kennethreitz.com>
Sun, 26 Aug 2012 22:34:16 +0000 (18:34 -0400)
committerKenneth Reitz <me@kennethreitz.com>
Sun, 26 Aug 2012 22:34:16 +0000 (18:34 -0400)
commitb9ecf45683e1a3c1ac0ed4c0d01d563dc7c63815
treeeee6410b667a695d577774546d2450eaad08c740
parentb257b10281837c1bbc08403758e9ad8ff7a87c68
parent9fb63adfa55cd5516f947ae103b0910eb092ced1
Merge remote-tracking branch 'origin/develop' into develop