CRM-11808 - Quick Search e-notices
Merge branch '4.2-master' of ssh://github.com/fuzionnz/civicrm into 4.2-master