Merge branch 'feature/detach' into develop
authorKenneth Reitz <me@kennethreitz.com>
Sun, 23 Oct 2011 19:18:09 +0000 (15:18 -0400)
committerKenneth Reitz <me@kennethreitz.com>
Sun, 23 Oct 2011 19:18:09 +0000 (15:18 -0400)

Trivial merge