tree 240be9569a78dfcf2401618bf167ecced8797c9e
parent f80c7912965461c2c96308afc06076699dd3583a
parent 1cda83e4b5d08c6c5697a2f274abd29c122450b7
author PJ <pjo@google.com> 1372828846 -0700
committer PJ <pjo@google.com> 1372828846 -0700

Merge branch 'master' of https://code.google.com/p/plexi

Conflicts:
	test/com/google/enterprise/adaptor/DocumentHandlerTest.java