testdatei fuer commit test
Kommentar angepasst
Merge remote-tracking branch 'origin/master'

Conflicts:
	administrator/components/com_srminkasso/controllers/billrun.php
Kommentar angepasst