Merge branch 'master' of ssh://git.indexdata.com/home/git/pub/lui-solr
authorDennis Schafroth <dennis@indexdata.com>
Thu, 2 Jan 2014 10:50:02 +0000 (11:50 +0100)
committerDennis Schafroth <dennis@indexdata.com>
Thu, 2 Jan 2014 10:50:02 +0000 (11:50 +0100)

Trivial merge