Merge branch 'Wshadow' into collectd-5.4
authorRuben Kerkhof <ruben@rubenkerkhof.com>
Thu, 3 Mar 2016 20:29:16 +0000 (21:29 +0100)
committerRuben Kerkhof <ruben@rubenkerkhof.com>
Thu, 3 Mar 2016 20:29:16 +0000 (21:29 +0100)
commit1eb3c043cb162ef198f86034cf7604be4a0a0d9c
treeb40725b11ca0e22882fa126b965b71efe86e5a5c
parent9599b110d313826b075ed4a8b73e0af8d07b23c2
parent89fc8d1d16779841bd693020d9035aa5f35f127d
Merge branch 'Wshadow' into collectd-5.4
src/ntpd.c