Merge branch 'master' of ssh://git.indexdata.com/home/git/pub/pazpar2
authorAdam Dickmeiss <adam@indexdata.dk>
Thu, 14 Jan 2010 12:21:20 +0000 (13:21 +0100)
committerAdam Dickmeiss <adam@indexdata.dk>
Thu, 14 Jan 2010 12:21:20 +0000 (13:21 +0100)
1  2 
src/logic.c
src/sel_thread.c

diff --cc src/logic.c
Simple merge
Simple merge