Merge remote-tracking branch 'upstream/master' into registry

author Costa Tsaousis <costa@tsaousis.gr>

Thu, 12 May 2016 18:12:12 +0000 (21:12 +0300)

committer Costa Tsaousis <costa@tsaousis.gr>

Thu, 12 May 2016 18:12:12 +0000 (21:12 +0300)
author Costa Tsaousis <costa@tsaousis.gr>
Thu, 12 May 2016 18:12:12 +0000 (21:12 +0300)
committer Costa Tsaousis <costa@tsaousis.gr>
Thu, 12 May 2016 18:12:12 +0000 (21:12 +0300)
diff --cc netdata-installer.sh
Simple merge
diff --cc src/daemon.c
Simple merge
diff --cc src/main.c
Simple merge
author	Costa Tsaousis <costa@tsaousis.gr>
	Thu, 12 May 2016 18:12:12 +0000 (21:12 +0300)
committer	Costa Tsaousis <costa@tsaousis.gr>
	Thu, 12 May 2016 18:12:12 +0000 (21:12 +0300)
		1	2
netdata-installer.sh	patch \|	diff1 \|	diff2 \|	blob \| history
src/daemon.c	patch \|	diff1 \|	diff2 \|	blob \| history
src/main.c	patch \|	diff1 \|	diff2 \|	blob \| history