Merge branch 'master' of ssh://git.indexdata.com/home/git/pub/lui-solr
authorDennis Schafroth <dennis@schafroth.com>
Tue, 3 Sep 2013 11:20:52 +0000 (13:20 +0200)
committerDennis Schafroth <dennis@schafroth.com>
Tue, 3 Sep 2013 11:20:52 +0000 (13:20 +0200)

Trivial merge