Added by Kostas Papadimitriou over 11 years ago
Merge branch 'master' into ui-helpdesk
Conflicts: snf-common/Changelog