using sapi name fn to detect origin of cfg script invoker. changed .bak to 700. got rid of old task.php
got rid of debug line in export script
exported db
Merge branch 'master' of /home/ubuntu/git/pma
Merge branch 'master' of /home/ubuntu/git/pma
Merge branch 'master' of /home/ubuntu/git/pma
Merge branch 'master' of /home/ubuntu/git/pma
Merge branch 'master' of /home/ubuntu/git/pma
Merge branch 'master' of /home/ubuntu/git/pma
Merge branch 'master' of /home/ubuntu/git/pma
Merge branch 'master' of /home/ubuntu/git/pma
Merge branch 'master' of /home/ubuntu/git/pma
Merge branch 'master' of /home/ubuntu/git/pma
Merge branch 'master' of /home/ubuntu/git/pma
Merge branch 'master' of /home/ubuntu/git/pma
Merge branch 'master' of /home/ubuntu/git/pma
committing db backup
Merge branch 'master' of /home/ubuntu/git/pma

Conflicts:
	.bak/sql/db_dump.sql
Merge branch 'master' of /home/ubuntu/git/pma
removing images from dev server git