fcb0e66d59684b02ed3f5f4b50f9d50c0572c155 - plexi/fs

commit: fcb0e66d59684b02ed3f5f4b50f9d50c0572c155
[log]
author: Miguel Fernandez <mifern@google.com>
Fri Mar 14 15:36:01 2014 -0700
committer: Miguel Fernandez <mifern@google.com>
Mon Mar 17 13:17:17 2014 -0700
tree: 0127f8890f1e53bc0bb2a6b17d0f88eae613cea6
parent: 3cb52b90a01b893d664a3e14b843ae9e05fa2b35 [diff]
parent: a5437e716da454708f0801c1428eaf2c6ee810dc [diff]

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

tree: 0127f8890f1e53bc0bb2a6b17d0f88eae613cea6

EXPERIMENTAL/
lib/
src/
test/
.gitignore
.gitmodules
build.xml
logging.properties