Merge branch 'develop'
authorKenneth Reitz <me@kennethreitz.com>
Sun, 13 Nov 2011 05:51:40 +0000 (00:51 -0500)
committerKenneth Reitz <me@kennethreitz.com>
Sun, 13 Nov 2011 05:51:40 +0000 (00:51 -0500)
commit6e9cb09fffd87a1d9fb3a6ee7bc485589986ea08
treef39305c0ba2458330d0dcd6aded922a156aedc8a
parent72943d024769f11f120a2776a35b3587c21113ac
parent9aa62d5622fd69bc77bad3ea24ed8379eb158de8
Merge branch 'develop'