Merge branch 'master' of git.dolda2000.com:/srv/git/r/jsvc master
-rw-r--r-- 7 .gitignore
-rw-r--r-- 1251 build.xml
drwxr-xr-x - etc
drwxr-xr-x - samples
drwxr-xr-x - src