Merge pull request #1548 from bbczeuz/zseng_dev_chrony

author Ruben Kerkhof <ruben@rubenkerkhof.com>

Sat, 4 Jun 2016 09:19:14 +0000 (11:19 +0200)

committer Ruben Kerkhof <ruben@rubenkerkhof.com>

Sat, 4 Jun 2016 09:19:14 +0000 (11:19 +0200)
author Ruben Kerkhof <ruben@rubenkerkhof.com>
Sat, 4 Jun 2016 09:19:14 +0000 (11:19 +0200)
committer Ruben Kerkhof <ruben@rubenkerkhof.com>
Sat, 4 Jun 2016 09:19:14 +0000 (11:19 +0200)
diff --cc configure.ac
Simple merge
diff --cc src/Makefile.am
Simple merge
diff --cc src/collectd.conf.in
Simple merge
diff --cc src/types.db
Simple merge
author	Ruben Kerkhof <ruben@rubenkerkhof.com>
	Sat, 4 Jun 2016 09:19:14 +0000 (11:19 +0200)
committer	Ruben Kerkhof <ruben@rubenkerkhof.com>
	Sat, 4 Jun 2016 09:19:14 +0000 (11:19 +0200)
		1	2
configure.ac	patch \|	diff1 \|	diff2 \|	blob \| history
src/Makefile.am	patch \|	diff1 \|	diff2 \|	blob \| history
src/collectd.conf.in	patch \|	diff1 \|	diff2 \|	blob \| history
src/types.db	patch \|	diff1 \|	diff2 \|	blob \| history