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)
commit9215da8982284ead9d548844a485bc54168ff3a5
tree06d75a42ce58f1d2240546b679c1fb73cff07778
parent76c21d428775e02c8b095d6b12f3d5ab323cf0fe
parente45d63a7ac71f6d4e28d5d8554d83aa71ea463a5
Merge branch 'protocol-version2' of ssh://git.indexdata.com/home/git/pub/pazpar2 into protocol-version2
src/settings.c