[SCM] OpenNMS branch, master, updated. opennms-1.11.0-1-350-gab70d6a

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "OpenNMS".

The branch, master has been updated
       via  ab70d6a4a4e895792b5b16ea70eb5138e24084a3 (commit)
       via  391cb1e4a2a7f0d29211b1ee72f76795746ae64b (commit)
       via  2d8e392c4d811ef8a71daa40d662948bcf34760e (commit)
      from  96fd60d56932ce55e17581607b6052bd17ed9075 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit ab70d6a4a4e895792b5b16ea70eb5138e24084a3
Merge: 391cb1e 96fd60d
Author: DJ Gregor <dj <at> gregor.com>
Date:   Fri Jun 29 18:24:20 2012 -0500

    Merge branch 'master' of ssh://opennms.git.sourceforge.net/gitroot/opennms/opennms

commit 391cb1e4a2a7f0d29211b1ee72f76795746ae64b
Author: DJ Gregor <dj <at> gregor.com>
Date:   Fri Jun 29 18:24:09 2012 -0500

    Fix XSD error in eventd-configuration.xsd

commit 2d8e392c4d811ef8a71daa40d662948bcf34760e
Author: DJ Gregor <dj <at> gregor.com>