Merge branch 'master' of mjesec.ffzg.hr:/git/blackray-experiments
-rw-r--r-- 829 blackray.conf
-rwxr-xr-x 1739 sql2blackray.pl
-rwxr-xr-x 433 start.sh