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)
commit1c256a41a684b68d2dea7c5bad34e02293a60de9
tree8d7dc527fc09f9177e1ee79915a39b8fa7d5f347
parent0ae46bd1e19dcc853c758af505c6f62f1f6be060
parent205db64953fc270a79878b89e5c6abc81c7c041a
Merge branch 'master' into solr_client