Merge branch 'maint-1.1'
- maint-1.1: OAIHarvest: remove_duplicates and regexp fixes
- NOTE The merge conflicts resolved according to PR #2601.
Conflicts:
modules/oaiharvest/lib/oai_harvest_daemon.py
Signed-off-by: Tibor Simko <tibor.simko@cern.ch>
Tibor Simko <tibor.simko@cern.ch> | Jan 26 2015, 15:06 |
Commit | Author | Details | Committed | |||
---|---|---|---|---|---|---|
3d60603e08d0 | Alexander Wagner/Tibor Simko | OAIHarvest: remove_duplicates and regexp fixes | Jan 26 2015 |