Merge branch 'master' of https://github.com/permanenttourist/class.Im… · sprain/class.Images.php@5f51609 · GitHub

Commit

Merge branch 'master' of https://github.com/permanenttourist/class.Im…

Browse files

…ages.php into permanenttourist-master

* 'master' of https://github.com/permanenttourist/class.Images.php:
  PNG transparency

Conflicts:
	class.Images.php

Loading branch information

sprain committed Aug 14, 2012

2 parents 4e190af + c31da73 commit 5f51609