Homec4science

Merge branch 'maint'

Authored by Tibor Simko <tibor.simko@cern.ch> on Jun 15 2010, 22:33.

Description

Merge branch 'maint'

Conflicts:
modules/webalert/lib/webalert_webinterface.py

Event Timeline

Tibor Simko <tibor.simko@cern.ch> committed R3600:f4d85d801c3d: Merge branch 'maint' (authored by Tibor Simko <tibor.simko@cern.ch>).Jun 15 2010, 22:33

Merged Changes

CommitAuthorDetailsCommitted
99aa178ff8ceTibor Simko
Added user-query check when setting up alerts. 
Jun 15 2010

Empty Commit

This commit is empty and does not affect any paths.