Merge branch 'collab/stompro/monitoring' of git.evergreen-ils.org:working/random... collab/stompro/monitoring
authorMichael Peters <mpeters@emeralddata.net>
Wed, 5 Aug 2015 18:24:48 +0000 (14:24 -0400)
committerMichael Peters <mpeters@emeralddata.net>
Wed, 5 Aug 2015 18:24:48 +0000 (14:24 -0400)

Trivial merge