Merge branch 'master' of ssh://git.indexdata.com/home/git/pub/pazpar2
authorAdam Dickmeiss <adam@indexdata.dk>
Mon, 16 Aug 2010 12:28:05 +0000 (14:28 +0200)
committerAdam Dickmeiss <adam@indexdata.dk>
Mon, 16 Aug 2010 12:28:05 +0000 (14:28 +0200)
commit5410847495fb43bdc5c3e630fbc3f15a964640f9
tree9e32a148cd6c50deaec603e13e8e9451cde8f32a
parent5c7635304f52342a8914fb5ca1d7ee528c6b44e6
parent4e87009b09fe60296d7edd1375707165a5c645e0
Merge branch 'master' of ssh://git.indexdata.com/home/git/pub/pazpar2

Conflicts:
src/client.c