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
Tibor Simko <tibor.simko@cern.ch> | Feb 17 2012, 09:14 |
Commit | Author | Details | Committed | |||
---|---|---|---|---|---|---|
14382598ed80 | Jerome Caffaro/Tibor Simko | WebSearch: updates some output phrases | Feb 17 2012 | |||
dcf3b720ecd5 | Jerome Caffaro/Tibor Simko | BibCirculation: updates some output phrases | Feb 17 2012 |