Homec4science

Merge branch 'maint-1.0' into maint-1.1

Authored by Tibor Simko <tibor.simko@cern.ch> on Nov 21 2012, 16:40.

Description

Merge branch 'maint-1.0' into maint-1.1

  • maint-1.0: WebSearch: respect output format content-type

Conflicts:
modules/bibformat/lib/bibformat.py

Event Timeline

Tibor Simko <tibor.simko@cern.ch> committed R3600:1332ed8d5084: Merge branch 'maint-1.0' into maint-1.1 (authored by Tibor Simko <tibor.simko@cern.ch>).Nov 21 2012, 16:40

Merged Changes

CommitAuthorDetailsCommitted
29ba8e14f447Jerome Caffaro/Tibor Simko
WebSearch: respect output format content-type 
Nov 21 2012