]> git.ipfire.org Git - thirdparty/knot-resolver.git/commit
Merge branch 'supervisor'
authorMarek Vavrusa <marek@vavrusa.com>
Tue, 29 Mar 2016 05:09:29 +0000 (22:09 -0700)
committerMarek Vavrusa <marek@vavrusa.com>
Tue, 29 Mar 2016 05:09:29 +0000 (22:09 -0700)
commit079a957bcdc79119b7981f297eff91ce199d8b5b
tree661e5dff136636fc903941a6496f5621e7cf86da
parentbb0c707f254c0e0c8edb54d35ccf8b01ea3257e8
parent4b7d12112f13e09c16bdb7b556f85321eacfa1b8
Merge branch 'supervisor'