Noah Levitt 3a429ffa44 Merge branch 'master' into hc43 ...

Conflicts:
	commons/pom.xml
	commons/src/main/java/org/archive/io/RecordingInputStream.java
	commons/src/main/java/org/archive/io/RecordingOutputStream.java
	commons/src/main/java/org/archive/io/ReplayInputStream.java
	dist/pom.xml
	engine/pom.xml
	modules/pom.xml
	modules/src/main/java/org/archive/modules/extractor/ExtractorHTTP.java
	modules/src/main/java/org/archive/modules/recrawl/FetchHistoryProcessor.java
	pom.xml

2014-01-10 17:52:03 -08:00

..

src

Merge branch 'master' into hc43

2014-01-10 17:52:03 -08:00

testdata/selftest

* **/.gitignore

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

.cvsignore

…

pom.xml

Merge branch 'master' into hc43

2014-01-10 17:52:03 -08:00