Merge remote-tracking branch 'origin/develop' into develop
authorKenneth Reitz <me@kennethreitz.com>
Tue, 28 Feb 2012 20:21:21 +0000 (15:21 -0500)
committerKenneth Reitz <me@kennethreitz.com>
Tue, 28 Feb 2012 20:21:21 +0000 (15:21 -0500)
commit65eaebb177bc515d190b97ad3d0a899fa0b4763c
treed13707d3cefc5a23b5aa3633760965b0eac1a7d9
parentab0714ce9cfe477f4e6777daf9bdf3cea0bc7442
parenta3a7c504ade46ed3a0e1375bfd803d1531fcd8fb
Merge remote-tracking branch 'origin/develop' into develop