Merge branch 'master' of ssh://git.indexdata.com/home/git/pub/lui-solr
authorDennis Schafroth <dennis@schafroth.com>
Tue, 2 Jul 2013 16:01:38 +0000 (18:01 +0200)
committerDennis Schafroth <dennis@schafroth.com>
Tue, 2 Jul 2013 16:01:38 +0000 (18:01 +0200)

Trivial merge