Merge branch 'develop'
authorKenneth Reitz <me@kennethreitz.com>
Sun, 11 Dec 2011 16:41:42 +0000 (11:41 -0500)
committerKenneth Reitz <me@kennethreitz.com>
Sun, 11 Dec 2011 16:41:42 +0000 (11:41 -0500)
commit8c1fd5db95e7b79ee60da8f9c3b3e508be69e3fa
treed77c694af2d4f2610a3c68e6f9215f81d87f8273
parentd1dfa0207058c111493054680d7c6102d4ec7905
parent10eed6344cf255f48bdee0b665381969ba27bde9
Merge branch 'develop'