Noah Levitt 6a2b4a4a76 Merge branch 'master' into freemarker ...

Conflicts:
	.classpath

2013-03-28 18:01:16 -07:00

..

src

Merge branch 'master' into freemarker

2013-03-28 18:01:16 -07:00

testdata/selftest

* **/.gitignore

2011-10-21 22:40:44 -07:00

.cvsignore

copy 'springy' branch to heritrix3

2009-05-11 22:56:36 +00:00

pom.xml

Merge branch 'master' into freemarker

2013-03-28 18:01:16 -07:00