Merge branch 'maint-1.1'
- maint-1.1: BibDocFile: support new magic library
Conflicts:
modules/bibdocfile/lib/bibdocfile.py
Tibor Simko <tibor.simko@cern.ch> | Feb 4 2013, 18:03 |
Commit | Author | Details | Committed | |||
---|---|---|---|---|---|---|
8abd2ae67634 | Tibor Simko | Merge branch 'maint-1.0' into maint-1.1 | Feb 4 2013 | |||
c0b2dcd46d09 | Samuele Kaplun/Tibor Simko | BibDocFile: support new magic library | Feb 4 2013 |