Merge branch 'master' of github.com:oxman/paste
Merge branch 'master' of github.com:oxman/paste