Override download url
Code review fixes
remove bad dependencies lwrp
iterating on the zabbix_source, trying to get it to work from arbitrary locations
Merge pull request #15 from andrewGarson/remove_xmlwriter

remove php-xmlwriter dependency
Merge branch 'master' of git://github.com/laradji/zabbix
Merge branch 'master' into cleanup_lwrps
Merge pull request #12 from RiotGames/zabbix_source

Override download url
Merge branch 'cleanup_lwrps' into integration
bump version for upload
Merge pull request #68 from RiotGames/cleanup_lwrps

Cleanup lwrps
Pull the source down for the apache web recipe so it can be on its own box
Merge branch 'upstream' into integration
Merge branch 'upstream' into zabbix_api

Conflicts:
	providers/item.rb
	providers/template.rb
Merge branch 'zabbix_api' into integration
Merge branch 'upstream' into pull_source_for_web_apache
Merge branch 'pull_source_for_web_apache' into integration
Ensure branch and version are on all zabbix_source resources
Merge branch 'zabbix_api' into integration

Conflicts:
	recipes/web_apache.rb
bump version