Public Git Hosting - htmlpurifier/bfroehle.git/commit

summary | log | graphiclog1 | graphiclog2 | commit | commitdiff | tree | refs | edit | fork
(merge: c8a3489 bcfbb83)

commit	23619073d14e09e8b3d9324c5ec40ea92d15a42d
author	Bradley M. Froehle <brad.froehle@gmail.com>
	Wed, 13 Apr 2011 20:29:37 +0000 (13 13:29 -0700)
committer	Bradley M. Froehle <brad.froehle@gmail.com>
	Wed, 13 Apr 2011 20:29:37 +0000 (13 13:29 -0700)
tree	58de0de6c7b259706163453f0aa7bc875622dbce	tree \| snapshot (tar.gz zip)
parent	c8a3489ca453f820dedff515b30b9b8a3aac9c97	commit \| diff
parent	bcfbb8338c63718cd92c49b0c659333f9d6f0f46	commit \| diff

Merge remote-tracking branch 'origin/master' into iframe

NEWS	diff1 \|	diff2 \|	blob \| history
configdoc/usage.xml	diff1 \|	diff2 \|	blob \| history
library/HTMLPurifier.includes.php	diff1 \|	diff2 \|	blob \| history
library/HTMLPurifier/ConfigSchema/schema.ser	diff1 \|	diff2 \|	blob \| history

HTMLPurifier with iframe extension