Merge branch 'develop'
authorKenneth Reitz <me@kennethreitz.com>
Tue, 15 Nov 2011 15:00:05 +0000 (10:00 -0500)
committerKenneth Reitz <me@kennethreitz.com>
Tue, 15 Nov 2011 15:00:05 +0000 (10:00 -0500)
commit1165bec773a3b58614bf2e4f20518027bc76d47b
treee0e33a97e58a0d1e7ab5d4cf2df7e75724679fbd
parent8f20058d0d46d2c37bca48d2697157a81f946828
parentb79dea97fd0d24bc1dbe52366565361c08675512
Merge branch 'develop'