Homec4science

Merge branch 'master' into next

Authored by Tibor Simko <tibor.simko@cern.ch> on Apr 26 2013, 13:47.

Description

Merge branch 'master' into next

  • master: BibField: initial release BibEncode: fix uuid Python 2.4 compatibility
  • Merge note: amended Bibrec model and requirements list.

Conflicts:
INSTALL
modules/miscutil/lib/inveniocfg.py

Signed-off-by: Tibor Simko <tibor.simko@cern.ch>

Event Timeline

Tibor Simko <tibor.simko@cern.ch> committed R3600:a240a50ce571: Merge branch 'master' into next (authored by Tibor Simko <tibor.simko@cern.ch>).Apr 26 2013, 13:47

Merged Changes

CommitAuthorDetailsCommitted
1fccd1176372Esteban J. G. Gabancho/Tibor Simko
BibField: initial release 
Apr 26 2013
37db097b61f7Lars Holm Nielsen/Tibor Simko
BibEncode: fix uuid Python 2.4 compatibility 
Apr 18 2013