Merge branch 'maint'
Conflicts:
modules/bibupload/lib/bibupload.py
Tibor Simko <tibor.simko@cern.ch> | May 21 2010, 17:43 |
Commit | Author | Details | Committed | |||
---|---|---|---|---|---|---|
e607c5440145 | Tibor Simko | BibUpload: fixed wrong _add_new_format() call | May 21 2010 | |||
f120de078d8b | Samuele Kaplun/Tibor Simko | BibUpload: fixed crash when merging MARC into bibdoc | May 21 2010 |