query?
Merge remote-tracking branch 'origin/master'

Conflicts:
	queryTranslator.class.php
Beispiel Applikation /gg (ZF)
Merge remote-tracking branch 'origin/master'

Conflicts:
	queryTranslator.class.php