Merge branch 'master' of ssh://git.indexdata.com/home/git/pub/lui-solr
authorDennis Schafroth <dennis@schafroth.com>
Thu, 13 Jun 2013 14:29:00 +0000 (16:29 +0200)
committerDennis Schafroth <dennis@schafroth.com>
Thu, 13 Jun 2013 14:29:00 +0000 (16:29 +0200)

Trivial merge