missing src-min-noconflict
Merge branch 'master' of github.com:iongion/trashbin