From: Dennis Schafroth <dennis@indexdata.com>
Date: Fri, 15 Jul 2011 13:58:53 +0000 (+0200)
Subject: Merge branch 'master' of ssh://git.indexdata.com/home/git/pub/pazpar2
X-Git-Tag: v1.5.7~20
X-Git-Url: http://lists.indexdata.dk/cgi-bin?a=commitdiff_plain;h=d30758a85b647a03a1ff4d83ce4fe41b1d219167;hp=d30758a85b647a03a1ff4d83ce4fe41b1d219167;p=pazpar2-moved-to-github.git

Merge branch 'master' of ssh://git.indexdata.com/home/git/pub/pazpar2
reset .cproject
Conflicts:
	.cproject
---