Merge branch 'develop'
authorKenneth Reitz <me@kennethreitz.com>
Sat, 24 Dec 2011 08:16:54 +0000 (03:16 -0500)
committerKenneth Reitz <me@kennethreitz.com>
Sat, 24 Dec 2011 08:16:54 +0000 (03:16 -0500)
commit9ed93044e02c4b44c7c1fa171788df310a15198f
treedd43d6fac435db480ef93d3f565ce47e06441e60
parent70fbd27d5c777f17c277c9bb5c3fa3b517d8e10e
parent0bfc029b5e549cb41b7c4999b96f3dfe892baf84
Merge branch 'develop'