Merge branch 'bug-1391'
-rw-r--r-- 259 .gitignore
drwxr-xr-x - dbadm
drwxr-xr-x - manager