tree 472f2e99962eb9c4324f27c6bc35fee0b311bb60
parent 18e204c641c4becdd2b8270504dfbf27811d50be
parent 5a3b41cfed0457a17ed22df6736176fc3469ee0c
author Marc Kriguer <myk@google.com> 1392939315 -0800
committer Marc Kriguer <myk@google.com> 1392939315 -0800

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