Merge branch 'develop'
authorKenneth Reitz <me@kennethreitz.com>
Sat, 19 Nov 2011 21:19:40 +0000 (16:19 -0500)
committerKenneth Reitz <me@kennethreitz.com>
Sat, 19 Nov 2011 21:19:40 +0000 (16:19 -0500)
commit42b33ae1a1cde04796ef2634a38ec589427a328e
tree859ec7b317d55d2eaa9e4194249f7168e329edce
parent1165bec773a3b58614bf2e4f20518027bc76d47b
parentab23536b1b084bb5dd901aa05dd638075351af47
Merge branch 'develop'