Merge branch 'master' into solr_facets
authorDennis Schafroth <dennis@indexdata.com>
Tue, 31 Aug 2010 11:14:42 +0000 (13:14 +0200)
committerDennis Schafroth <dennis@indexdata.com>
Tue, 31 Aug 2010 11:14:42 +0000 (13:14 +0200)
commitcff93bfc3cff822251abf7687bb5791a81b2bf0c
tree8798c971398ce976bf260e4d6823b27c47e9aee9
parent120d41020531bb15a771971e9287b2f8f2b072ae
parentb8b750a84e0c9f7253d210f9604e385bd84a7569
Merge branch 'master' into solr_facets