Merge branch 'master' of ssh://git.indexdata.com/home/git/pub/lui-solr
authorDennis Schafroth <dennis@indexdata.com>
Tue, 27 Aug 2013 14:13:05 +0000 (16:13 +0200)
committerDennis Schafroth <dennis@indexdata.com>
Tue, 27 Aug 2013 14:13:05 +0000 (16:13 +0200)

Trivial merge