Merge branch 'master' of ssh://git.indexdata.com/home/git/pub/pazpar2
authorAdam Dickmeiss <adam@indexdata.dk>
Tue, 29 Sep 2009 07:48:22 +0000 (09:48 +0200)
committerAdam Dickmeiss <adam@indexdata.dk>
Tue, 29 Sep 2009 07:48:22 +0000 (09:48 +0200)
1  2 
src/connection.c
src/logic.c

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