Merge branch 'master' of ssh://git.indexdata.com/home/git/pub/lui-solr
authorDennis Schafroth <dennis@indexdata.com>
Thu, 25 Apr 2013 12:06:20 +0000 (14:06 +0200)
committerDennis Schafroth <dennis@indexdata.com>
Thu, 25 Apr 2013 12:06:20 +0000 (14:06 +0200)

Trivial merge