Merge branch 'master' into solr_client
authorAdam Dickmeiss <adam@indexdata.dk>
Tue, 17 Aug 2010 11:16:54 +0000 (13:16 +0200)
committerAdam Dickmeiss <adam@indexdata.dk>
Tue, 17 Aug 2010 11:16:54 +0000 (13:16 +0200)
commit7be47e0daa09a9cf939668a65831cfaaa22bf2ff
tree90c98765998f5905823f403b7f0eae88ecb75cda
parent90822107107281df9caf3ad66a693cb7403b16f8
parentaab59e4ad859bc77a361760c9e1dc3ebe6690233
Merge branch 'master' into solr_client