Merge remote-tracking branch 'helma/master'

Conflicts:
	.gitignore
	apps
	modules
This commit is contained in:
Tobi Schäfer 2013-04-07 17:18:29 +02:00
commit ff7bba76cf
120 changed files with 14792 additions and 48 deletions

3
.gitignore vendored
View file

@ -4,3 +4,6 @@ db/*
lib/ext
modules/
server.properties
classes/*
launcher.jar
lib/helma*.jar