Dave Bell 79c7540fa7 Merge commit '4430658932762ead3661231492b8074f144ea4b6' into influxdb-php
Conflicts:
	lib/influxdb-php/.gitignore
	lib/influxdb-php/README.md
2016-03-29 23:06:15 +01:00
..