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

Conflicts:
	src/com/google/enterprise/adaptor/ad/AdAdaptor.java
	test/com/google/enterprise/adaptor/ad/AdAdaptorTest.java
tree: 472f2e99962eb9c4324f27c6bc35fee0b311bb60
  1. .gitignore
  2. .gitmodules
  3. build.xml
  4. lib/
  5. logging.properties
  6. src/
  7. test/