Merge branch 'master' of ssh://git.indexdata.com/home/git/pub/lui-solr
authorDennis Schafroth <dennis@indexdata.com>
Thu, 22 Aug 2013 08:21:22 +0000 (10:21 +0200)
committerDennis Schafroth <dennis@indexdata.com>
Thu, 22 Aug 2013 08:21:22 +0000 (10:21 +0200)

Trivial merge