Homec4science

Merge branch 'maint-1.0'

Authored by Tibor Simko <tibor.simko@cern.ch> on Feb 17 2012, 09:14.

Description

Merge branch 'maint-1.0'

  • maint-1.0: WebSearch: updates some output phrases BibCirculation: updates some output phrases

Conflicts:
modules/websearch/lib/search_engine.py

Event Timeline

Tibor Simko <tibor.simko@cern.ch> committed R3600:a0f69fe243f2: Merge branch 'maint-1.0' (authored by Tibor Simko <tibor.simko@cern.ch>).Feb 17 2012, 09:14

Merged Changes

CommitAuthorDetailsCommitted
14382598ed80Jerome Caffaro/Tibor Simko
WebSearch: updates some output phrases 
Feb 17 2012
dcf3b720ecd5Jerome Caffaro/Tibor Simko
BibCirculation: updates some output phrases 
Feb 17 2012