Merge branch 'master' of ssh://hsh04-source@hsh04.hostsharing.net/home/doms...

Peter Hormanns

2012-10-30 66cfd9402762f5eeb60317f48fbd7a22edf4f9c1

Merge branch 'master' of ssh://hsh04-source@hsh04.hostsharing.net/home/doms/source.hostsharing.net/source/hsadmin.git

 hsarback/.classpath

@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<classpath>
    <classpathentry kind="src" path="src"/>
    <classpathentry kind="src" path="test"/>
    <classpathentry kind="src" path="PurodhasLocaleTests"/>
    <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.6"/>
    <classpathentry kind="lib" path="lib/activemq-core-5.4.2.jar"/>
    <classpathentry kind="lib" path="lib/commons-beanutils-1.8.3.jar"/>

 hsarback/.gitignore

@@ -1,2 +1,3 @@
/build
/webapp
/PurodhasLocaleTests