Automated merge with https://gss.googlecode.com/hg/
[pithos] / webdav / WEB-INF /
drwxr-xr-x   ..
-rw-r--r-- 342 jboss-web.xml
-rw-r--r-- 2321 web.xml