Revision 36f34c8987ed4f2300cda683d75258cff1f5fa7f

Committed on 23/04/2013 10:01 pm by Tobias Schlitt <toby@php.net> [GitHub Diff]

Merge branch 'fix-imagemagick-watermark' of https://github.com/bdunogier/ImageConversion into bdunogier-fix-imagemagick-watermark