Merge branch 'master' of ssh://git.indexdata.com/home/git/pub/lui-solr
authorDennis Schafroth <dennis@indexdata.com>
Thu, 24 Apr 2014 10:58:08 +0000 (12:58 +0200)
committerDennis Schafroth <dennis@indexdata.com>
Thu, 24 Apr 2014 10:58:08 +0000 (12:58 +0200)

Trivial merge