Merge branch 'master' of ssh://git.indexdata.com/home/git/pub/lui-solr
authorDennis Schafroth <dennis@schafroth.com>
Thu, 28 Nov 2013 05:20:52 +0000 (06:20 +0100)
committerDennis Schafroth <dennis@schafroth.com>
Thu, 28 Nov 2013 05:20:52 +0000 (06:20 +0100)

Trivial merge