From: Adam Dickmeiss <adam@indexdata.dk>
Date: Thu, 26 Apr 2012 12:23:17 +0000 (+0200)
Subject: Merge branch 'master' of ssh://git.indexdata.com/home/git/pub/pazpar2
X-Git-Tag: v1.6.13~9^2~4^2~11
X-Git-Url: http://lists.indexdata.com/cgi-bin?a=commitdiff_plain;ds=sidebyside;h=3c787972fe8ea6931db1ecf13783b00964f326bc;hp=3c787972fe8ea6931db1ecf13783b00964f326bc;p=pazpar2-moved-to-github.git

Merge branch 'master' of ssh://git.indexdata.com/home/git/pub/pazpar2

Conflicts:
	src/settings.h
---