Merge branch 'master' of ssh://git.indexdata.com/home/git/pub/lui-solr
authorDennis Schafroth <dennis@indexdata.com>
Wed, 16 Oct 2013 10:25:52 +0000 (12:25 +0200)
committerDennis Schafroth <dennis@indexdata.com>
Wed, 16 Oct 2013 10:25:52 +0000 (12:25 +0200)
1  2 
conf/schema.xml

diff --cc conf/schema.xml
Simple merge