Merge branch 'protocol-version2' of ssh://git.indexdata.com/home/git/pub/pazpar2...
authorDennis Schafroth <dennis@indexdata.com>
Fri, 20 Apr 2012 08:50:06 +0000 (10:50 +0200)
committerDennis Schafroth <dennis@indexdata.com>
Fri, 20 Apr 2012 08:50:06 +0000 (10:50 +0200)
1  2 
src/settings.c

diff --cc src/settings.c
Simple merge