fix some conflicts that for some reason weren't resolved during the last cherry-picks
[citadel.git] / buildbot /
drwxr-xr-x   ..
-rw-r--r-- 12267 master.cfg