Resolve conflicts -- Jason, please check that the authentication logic is still good.
[mkws-moved-to-github.git] / tools / service-proxy /
drwxr-xr-x   ..
-rw-r--r-- 34 .gitignore
-rw-r--r-- 185 Makefile
drwxr-xr-x - pazpar2
-rw-r--r-- 1900 service-proxy.properties