Merge remote-tracking branch 'origin/develop' into develop
authorKenneth Reitz <me@kennethreitz.com>
Fri, 23 Dec 2011 22:24:34 +0000 (17:24 -0500)
committerKenneth Reitz <me@kennethreitz.com>
Fri, 23 Dec 2011 22:24:34 +0000 (17:24 -0500)
commit0001f5b651213e5aa6e2e95575b6a44bb559b53f
tree9adb11ae7271fea453263292dd0ab9779b6d8309
parente1615e0f1e342d89d09df8289c0b32d3b0e9fd6a
parent3483bae24f0fc5f18f7466fffa83584068474a59
Merge remote-tracking branch 'origin/develop' into develop