Merge branch 'mgiuca-uri-cleanup-nonpath' into develop
authorKenneth Reitz <me@kennethreitz.com>
Wed, 15 Feb 2012 06:00:52 +0000 (01:00 -0500)
committerKenneth Reitz <me@kennethreitz.com>
Wed, 15 Feb 2012 06:00:52 +0000 (01:00 -0500)

Trivial merge