Merge branch 'master' of ssh://git.indexdata.com/home/git/pub/lui-solr
authorDennis Schafroth <dennis@indexdata.com>
Sun, 18 Sep 2011 22:10:02 +0000 (22:10 +0000)
committerDennis Schafroth <dennis@indexdata.com>
Sun, 18 Sep 2011 22:10:02 +0000 (22:10 +0000)

Trivial merge