Added Hibernate support for org.opennms.netmgt.capsd
Merge remote-tracking branch 'upstream/master'
Partially migrated org.opennms.netmgt.capsd.BroadcastEventProcessor to Hibernate and added necessary method in DAOs
Merge remote-tracking branch 'upstream/master'
Partially migrated org.opennms.netmgt.capsd.BroadcastEventProcessor to Hibernate and added necessary method in DAOs
separate tests that care about ordering for OPENNMS-MASTER17-TEST-59
Not a fix for NMS-5865 but added a missing closing tag. Also, seems I forgot to
git add one file from my last change.
recursively get children in groups
Merge branch 'master' of git://github.com/vishwaAbhinav/opennms-1 into vishwaAbhinav-master
NMS-5281 handle non-ASCII UTF-8 properly (reimplemented)
Merge branch '1.12'

Conflicts:
	opennms-webapp/src/main/webapp/WEB-INF/jsp/alarm/list.jsp
Merge remote-tracking branch 'origin/master' into pull-requests
Merge branch 'vishwaAbhinav-master' into pull-requests