[Merge] ~kick-d/ubuntu/+source/ntp:logical/4.2.8p4+dfsg-3-ntpdate.if-up into ~ubuntu-server-dev/ubuntu/+source/ntp:debian/sid

[Robie Basak]

I made some tweaks to the changelog (I'll push the git tree to ~ubuntu-server-dev shortly with the breakdown) and uploaded. Thanks Pierre - this was a particularly complex merge and you handled it well.
-- 
https://code.launchpad.net/~kick-d/ubuntu/+source/ntp/+git/ntp/+merge/284875
Your team Ubuntu Server Developers is subscribed to branch ~ubuntu-server-dev/ubuntu/+source/ntp:debian/sid.