Merge branch 'master' of ssh://git.indexdata.com/home/git/pub/lui-solr
authorDennis Schafroth <dennis@indexdata.com>
Wed, 3 Jul 2013 14:26:14 +0000 (16:26 +0200)
committerDennis Schafroth <dennis@indexdata.com>
Wed, 3 Jul 2013 14:26:14 +0000 (16:26 +0200)

Trivial merge