Merge branch 'master' of ssh://git.indexdata.com/home/git/pub/lui-solr
authorDennis Schafroth <dennis@schafroth.com>
Fri, 29 Nov 2013 11:15:27 +0000 (12:15 +0100)
committerDennis Schafroth <dennis@schafroth.com>
Fri, 29 Nov 2013 11:15:27 +0000 (12:15 +0100)

Trivial merge