Merge branch 'master' of ssh://git/home/git/pub/pazpar2
authorSebastian Hammer <quinn@indexdata.com>
Wed, 2 Sep 2009 11:45:06 +0000 (11:45 +0000)
committerSebastian Hammer <quinn@indexdata.com>
Wed, 2 Sep 2009 11:45:06 +0000 (11:45 +0000)
1  2 
src/logic.c

diff --cc src/logic.c
Simple merge