Merge remote-tracking branch 'origin/develop' into develop
authorKenneth Reitz <me@kennethreitz.com>
Sat, 25 Aug 2012 14:33:42 +0000 (10:33 -0400)
committerKenneth Reitz <me@kennethreitz.com>
Sat, 25 Aug 2012 14:33:42 +0000 (10:33 -0400)
commit4571a9e50ed8c7f2eebacde5a7c24b27bf0055fa
tree4fd1933e933f374b8113e257a93e61c0b2c052df
parent95c82c7c0b92baddcf48f6faf15c09a6e3266e3d
parent390a4ae4bc946bfd08860ab20ccde5e0e49ef711
Merge remote-tracking branch 'origin/develop' into develop