[commits] [batctl] master: Merge branch 'maint' (5e8a144)

Repository : ssh://git@open-mesh.org/batctl

On branch : master

commit 5e8a144c1b2e94790c315f310ab293b15a5fdc13 Merge: 5fb3a49 c3466e2 Author: Sven Eckelmann sven@narfation.org Date: Mon Jul 31 11:13:00 2017 +0200

Merge branch 'maint'

5e8a144c1b2e94790c315f310ab293b15a5fdc13 CHANGELOG | 6 ++++++ 1 file changed, 6 insertions(+)

diff --cc CHANGELOG index 6e13d69,c6bc969..679b1e5 --- a/CHANGELOG +++ b/CHANGELOG @@@ -1,3 -1,11 +1,9 @@@ + batctl 2017.2 + + * coding style cleanups and refactoring - * bugs squashed: - - Fix error messages on traceroute send failures + + -- Fri, 28 Jul 2017 13:42:03 +0200 + batctl 2017.1

* (no changes)