Merge remote-tracking branch 'refs/remotes/origin/master' into dev - cnping

	cnping Minimal Graphical Ping Tool
	git clone https://git.sinitax.com/cnlohr/cnping
	Log \| Files \| Refs \| Submodules \| README \| LICENSE \| sfeed.txt

commit 973ecc95bbdfbad66e29df15bbcf7ea7b0761080
parent 593d80f8aded3f6f289bfab20eaa2d61b0493f76
Author: CNLohr <lohr85@gmail.com>
Date:   Wed, 21 Jun 2017 10:36:50 -0400

Merge remote-tracking branch 'refs/remotes/origin/master' into dev