Merge branch 'master' of ssh://git/home/git/pub/pazpar2
authorSebastian Hammer <quinn@dart.(none)>
Tue, 1 Jun 2010 01:53:17 +0000 (01:53 +0000)
committerSebastian Hammer <quinn@dart.(none)>
Tue, 1 Jun 2010 01:53:17 +0000 (01:53 +0000)
1  2 
etc/tmarc.xsl

diff --cc etc/tmarc.xsl
Simple merge