Merge branch 'en/dirty-merge-fixes'
[gitweb.git] / negotiator /
drwxr-xr-x   parent (dest: ; base: c18ac30e9ebcf7b7e2fbd992744e63c71089a12a)
-rw-r--r-- 4258 default.c
-rw-r--r-- 160 default.h