Copy config for phpmyadmin
Merge remote-tracking branch 'origin/master'

Conflicts:
	install_script_raspi