Merge branch 'master' of ssh://git.indexdata.com:222/home/git/pub/pazpar2
authorWolfram Schneider <wosch@indexdata.dk>
Tue, 22 Mar 2011 18:16:45 +0000 (18:16 +0000)
committerWolfram Schneider <wosch@indexdata.dk>
Tue, 22 Mar 2011 18:16:45 +0000 (18:16 +0000)
1  2 
doc/book.xml

diff --cc doc/book.xml
Simple merge