Homec4science

Merge branch 'maint'

Authored by Tibor Simko <tibor.simko@cern.ch> on Jun 21 2010, 00:50.

Description

Merge branch 'maint'

Conflicts:
modules/websearch/lib/search_engine.py

Event Timeline

Tibor Simko <tibor.simko@cern.ch> committed R3600:e97eb093b985: Merge branch 'maint' (authored by Tibor Simko <tibor.simko@cern.ch>).Jun 21 2010, 00:50

Merged Changes

CommitAuthorDetailsCommitted
77b0ed7fc113Samuele Kaplun/Tibor Simko
WebSearch: safer protection of restricted records 
Jun 21 2010
f4d395772691Benoit Thiell/Tibor Simko
installation: purged multiple targets 
Jun 21 2010
deded342f5c0Samuele Kaplun/Tibor Simko
WebSession: catching exception when wrong cookie 
Jun 21 2010

Empty Commit

This commit is empty and does not affect any paths.