Homec4science

Merge branch 'maint'

Authored by Tibor Simko <tibor.simko@cern.ch> on May 21 2010, 17:43.

Description

Merge branch 'maint'

Conflicts:
modules/bibupload/lib/bibupload.py

Event Timeline

Tibor Simko <tibor.simko@cern.ch> committed R3600:0be9fdb6ee87: Merge branch 'maint' (authored by Tibor Simko <tibor.simko@cern.ch>).May 21 2010, 17:43

Merged Changes

CommitAuthorDetailsCommitted
e607c5440145Tibor Simko
BibUpload: fixed wrong _add_new_format() call 
May 21 2010
f120de078d8bSamuele Kaplun/Tibor Simko
BibUpload: fixed crash when merging MARC into bibdoc 
May 21 2010