Homec4science

Merge branch 'maint-1.0'

Authored by Tibor Simko <tibor.simko@cern.ch> on Sep 7 2012, 14:51.

Description

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

Event Timeline

Tibor Simko <tibor.simko@cern.ch> committed R3600:3d0af5673fac: Merge branch 'maint-1.0' (authored by Tibor Simko <tibor.simko@cern.ch>).Sep 7 2012, 14:52

Merged Changes

CommitAuthorDetailsCommitted
625baba0bdc9Alexander Wagner/Tibor Simko
I18N: updates to German translation 
Sep 7 2012
c990b4a2ce95Stefan Hesselbach/Tibor Simko
BibHarvest: OAI harvesting via HTTP proxy 
Sep 7 2012