Merge branch 'query' of https://github.com/stapelberg/dsa-puppet
authorJulien Cristau <jcristau@debian.org>
Tue, 2 May 2017 20:54:50 +0000 (22:54 +0200)
committerJulien Cristau <jcristau@debian.org>
Tue, 2 May 2017 20:54:50 +0000 (22:54 +0200)
Signed-off-by: Julien Cristau <jcristau@debian.org>

Trivial merge