tree c6556cfc9257bf4c2064fabcf319cf8b2586a2b4
parent 38c24cdb10b5fa437ebe41bfa1a9496aa4053bbb
parent 6f0564d377bd5eb7ad4935825409cd6eb017fd01
author Eric Anderson <ejona@google.com> 1372870969 -0700
committer Eric Anderson <ejona@google.com> 1372870969 -0700

Merge branch 'master' into improve-tests

Conflicts:
	test/com/google/enterprise/adaptor/sharepoint/SharePointAdaptorTest.java