Merge branch 'master' of github.com:jonathanmtran/gallery3-contrib
Merge branch 'master' of git://github.com/jonathanmtran/gallery3-contrib