Merge branch 'develop'
authorKenneth Reitz <me@kennethreitz.com>
Sun, 23 Oct 2011 19:21:42 +0000 (15:21 -0400)
committerKenneth Reitz <me@kennethreitz.com>
Sun, 23 Oct 2011 19:21:42 +0000 (15:21 -0400)
commit6b9cb059f6c8b83e4f756aac69bea8693e4a2708
treed86209395e2495e6831b6d45f998b130fbc380b8
parent5b5b3def0029a1eb3349f91402c58dc730804f33
parent02cf3dce3786becb89f631185e8207080b0b726c
Merge branch 'develop'