:Merge branch 'master' of ssh://git.indexdata.com/home/git/pub/lui-solr
authorDennis Schafroth <dennis@indexdata.com>
Fri, 29 Nov 2013 15:12:08 +0000 (16:12 +0100)
committerDennis Schafroth <dennis@indexdata.com>
Fri, 29 Nov 2013 15:12:08 +0000 (16:12 +0100)

Trivial merge