Merge branch 'maint-1.0'
- maint-1.0: I18N: updates to German translation BibHarvest: OAI harvesting via HTTP proxy
Conflicts:
modules/bibharvest/lib/oai_harvest_getter.py
Tibor Simko <tibor.simko@cern.ch> | Sep 7 2012, 14:52 |
Commit | Author | Details | Committed | |||
---|---|---|---|---|---|---|
625baba0bdc9 | Alexander Wagner/Tibor Simko | I18N: updates to German translation | Sep 7 2012 | |||
c990b4a2ce95 | Stefan Hesselbach/Tibor Simko | BibHarvest: OAI harvesting via HTTP proxy | Sep 7 2012 |