Merge branch 'maint'
Conflicts:
modules/bibharvest/lib/oai_repository_server.py
modules/webstyle/lib/webstyle_templates.py
modules/websubmit/lib/bibdocfile.py
modules/websubmit/lib/bibdocfilecli.py
Description
Description
Details
Details
- Committed
Tibor Simko <tibor.simko@cern.ch> Jun 15 2010, 21:12 - Parents
- R3600:e35ffd4f7894: bibdocfile: backport extension guessing algorithm
R3600:571e79262a44: Merge branch 'maint' - Branches
- Unknown
- Tags
Merged Changes
Merged Changes
| Commit | Author | Details | Committed | |||
|---|---|---|---|---|---|---|
| e35ffd4f7894 | Samuele Kaplun/Tibor Simko | bibdocfile: backport extension guessing algorithm | Jun 15 2010 | |||
| acdcae7bb74a | Samuele Kaplun/Tibor Simko | bibdocfile: fix --fix-marc when no files attached | Jun 15 2010 | |||
| 54d2f0989a2d | Samuele Kaplun/Tibor Simko | Added language information to export actions | Jun 15 2010 | |||
| 60ee2f611dbe | Samuele Kaplun/Tibor Simko | Removed removal of default language during link creation. | Jun 15 2010 | |||
| 76039025e1f4 | Samuele Kaplun/Tibor Simko | BibHarvest: removed trailing '/' in /oai2d baseurl | Jun 15 2010 |