Habemus self joins :)
Merge branch 'master' of github.com:saltzm/yadi
Merge branch 'master' of github.com:saltzm/yadi