]> git.ipfire.org Git - thirdparty/ntp.git/commit
Merge hydra.localnet:/home/jnperlin/Projects/Packages/NTP-DEV/src/ntp-stable-3095
authorJuergen Perlinger <perlinger@ntp.org>
Wed, 28 Sep 2016 19:55:03 +0000 (21:55 +0200)
committerJuergen Perlinger <perlinger@ntp.org>
Wed, 28 Sep 2016 19:55:03 +0000 (21:55 +0200)
commit585b26d2ca251c91cda9b893b4ff2ef1f7be2c45
treee500b1d4c1c853c4a834631c3084a464935d6247
parent6bce5d3b5df67325c5620b593fdf7e670179f77d
parent130b8cea1821849e6b926dfb992c3da2ed4fe4f3
Merge hydra.localnet:/home/jnperlin/Projects/Packages/NTP-DEV/src/ntp-stable-3095
into  hydra.localnet:/home/jnperlin/Projects/Packages/NTP-DEV/src/ntp-stable-3059-conflict

bk: 57ec2017cXK7hSwjtvFym6RDHv9Ikw