Merge branch 'master' into solr_client
authorAdam Dickmeiss <adam@indexdata.dk>
Thu, 12 Aug 2010 08:20:33 +0000 (10:20 +0200)
committerAdam Dickmeiss <adam@indexdata.dk>
Thu, 12 Aug 2010 08:20:33 +0000 (10:20 +0200)

Trivial merge