Merge branch 'master' of ssh://git.indexdata.com/home/git/pub/pazpar2
authorDennis Schafroth <dennis@indexdata.com>
Fri, 15 Jul 2011 13:58:53 +0000 (15:58 +0200)
committerDennis Schafroth <dennis@indexdata.com>
Fri, 15 Jul 2011 13:58:53 +0000 (15:58 +0200)
reset .cproject
Conflicts:
.cproject


No differences found