JP c5c701d178 resolve merge conflicts		2015-08-11 20:41:45 -05:00
..
all	Revert "PR #59, implementation of multiple outputs"	2015-08-11 10:34:00 -06:00
influxdb	resolve merge conflicts	2015-08-11 20:41:45 -05:00
registry.go	resolve merge conflicts	2015-08-11 20:41:45 -05:00