Merge branch 'master' of ssh://git.indexdata.com/home/git/pub/pazpar2
authorMike Taylor <mike@miketaylor.org.uk>
Thu, 18 Feb 2010 14:00:50 +0000 (14:00 +0000)
committerMike Taylor <mike@miketaylor.org.uk>
Thu, 18 Feb 2010 14:00:50 +0000 (14:00 +0000)
1  2 
doc/book.xml

diff --cc doc/book.xml
Simple merge