]> git.ipfire.org Git - thirdparty/ntp.git/commit
Merge lokeshw24@psp-deb1:/home/viperus/ntp-stable-unity
authorLokesh Walase <lokeshw24@ntp.org>
Wed, 29 Jul 2015 08:03:34 +0000 (13:33 +0530)
committerLokesh Walase <lokeshw24@ntp.org>
Wed, 29 Jul 2015 08:03:34 +0000 (13:33 +0530)
commitc36b3767dc407a3f4908660dcb84f96074bc704a
tree6eed702672a940502bf79cf2ff7ab2c16c7beda8
parent83233d5cfce66662f0bcb0a17e2897ae09e855f6
parent61e35d8fe6a38588211bf44985742d0a0490f011
Merge lokeshw24@psp-deb1:/home/viperus/ntp-stable-unity
into  dadasgift.(none):/home/loki/ntp_gsoc/2_damir_code/ntp-stable-unity

bk: 55b888d6rfx8ZH_1trthZDWOpQHopA