tree 0127f8890f1e53bc0bb2a6b17d0f88eae613cea6
parent 3cb52b90a01b893d664a3e14b843ae9e05fa2b35
parent a5437e716da454708f0801c1428eaf2c6ee810dc
author Miguel Fernandez <mifern@google.com> 1394836561 -0700
committer Miguel Fernandez <mifern@google.com> 1395087437 -0700

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

Conflicts:
	src/com/google/enterprise/adaptor/fs/FsAdaptor.java
	test/com/google/enterprise/adaptor/fs/FsAdaptorTest.java