merge
Merge branch 'master' of github.com:bueltge/WP-Image-Resizer