From e94622c319e4307617b202f19d3ec05b21a9bb49 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=B6rg=20Frings-F=C3=BCrst?= <debian@jff-webhosting.net>
Date: Sun, 27 Sep 2015 08:20:20 +0200
Subject: merge to 1.0.25+git20150927

---
 AUTHORS | 4 ++++
 1 file changed, 4 insertions(+)

(limited to 'AUTHORS')

diff --git a/AUTHORS b/AUTHORS
index cf0f5e0..53a0ba3 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -77,6 +77,7 @@ Backends:
  niash:         Ullrich Sigwanz (*), Bertrik Sikken
  p5:		Stéphane Voltz (*)
  pie:           Simon Munton (*)
+ pieusb:        Jan Vleeshouwers, Michael Rickmann, Klaus Kämpf
  pint:          Gordon Matzigkeit
  pixma:         Wittawat Yamwong (*)
                 Nicolas Martin (*)
@@ -196,12 +197,14 @@ Jon Chambers <jon@jon.demon.co.uk>
 Jonathan Bravo Lopez <jkdsoft@gmail.com>
 Juergen G. Schimmer <schimmi@nbgm.siemens.de>
 Julien Blache <jb@jblache.org>
+Jan Vleeshouwers <J.M.Vleeshouwers@tue.nl>
 Karl Anders Øygard <karlo@opera.no>
 Karl Heinz Kremer <khk@khk.net>
 Karsten Festag <karsten.festag@gmx.de>
 Kazuhiro Sasayama <kaz@hypercore.co.jp>
 Kazuya Fukuda <kaafuu@mug.biglobe.ne.jp>
 Kevin Charter <charter@cs.rice.edu>
+Klaus Kämpf <kkaempf@suse.com>
 Louis Lagendijk <llagendijk-guest at users.alioth.debian.org>
 M.F. <massifr@tiscalinet.it>
 Manuel Panea <Manuel.Panea@rzg.mpg.de>
@@ -216,6 +219,7 @@ Max Vorobiev <pcwizard@yandex.ru>
 Meino Christian Cramer <mccramer@s.netic.de>
 Michael Herder <crapmail@nurfuerspam.de>
 Michael K. Johnson <johnsonm@redhat.com>
+Michael Rickmann <mrickma@gwdg.de>
 Michel Roelofs <michelr@stack.nl>
 Milon Firikis <milonf@ariadne-t.gr>
 Mitsuru Okaniwa <m-okaniwa@bea.hi-ho.ne.jp>
-- 
cgit v1.2.3