Merge branch 'release/0.0.3' into develop
bump to 0.0.4-SNAPSHOT
Rename MAVEN_OPTS to JVM_OPTS
Try checking Darwin/f18/f19 xpath, which are all different
Add comment
Merge pull request #13 from zenoss/feature/betterxpath

Please review branch feature/betterxpath
Merge branch 'feature/betterxpath' into develop
Merge branch 'develop' of https://github.com/zenoss/zenoss.metric.consumer into develop
refactored to use the ZenossCredentials class from zapp
Merge pull request #14 from zenoss/systemuser

refactored to use the ZenossCredentials class from zapp
Revised GNUmakefile to use the top-level make
Removed old zenmagic.mk
Merge branch 'develop' of https://github.com/zenoss/zenoss.metric.consumer into develop
Merge branch 'develop' into feature/central-magic

Conflicts:
	GNUmakefile
	zenmagic.mk
Merge pull request #15 from zenoss/feature/central-magic

Feature/central magic
Merge branch 'develop' of github.com:zenoss/zenoss.metric.consumer into develop
fixes ZEN-9294; replace invalid characters with "-"
Merge pull request #16 from zenoss/feature/ZEN-9294

Please review branch feature/ZEN-9294
use 0.0.11 of zapp
Merge pull request #17 from zenoss/feature/US8280

Reviewed by Ian