merging from 1,2 branch. Seems OK
[koha_fer] / koha.conf
1 database=koha
2 hostname=localhost
3 user=Koha
4 pass=password