Merge branch 'master' of ssh://git.indexdata.com/home/git/pub/lui-solr
authorDennis Schafroth <dennis@indexdata.com>
Mon, 19 Aug 2013 10:47:14 +0000 (12:47 +0200)
committerDennis Schafroth <dennis@indexdata.com>
Mon, 19 Aug 2013 10:47:14 +0000 (12:47 +0200)

Trivial merge