From mike.gabriel@das-netzwerkteam.de  Fri May 15 15:56:56 2015
Received: (at control) by bugs.x2go.org; 15 May 2015 13:56:57 +0000
X-Spam-Checker-Version: SpamAssassin 3.3.2 (2011-06-06) on
	ymir.das-netzwerkteam.de
X-Spam-Level: 
X-Spam-Status: No, score=-0.1 required=5.0 tests=BAYES_00,MISSING_SUBJECT,
	URIBL_BLOCKED autolearn=no version=3.3.2
Received: from freya.das-netzwerkteam.de (freya.das-netzwerkteam.de [88.198.48.199])
	by ymir.das-netzwerkteam.de (Postfix) with ESMTPS id BCB675DA82
	for <control@bugs.x2go.org>; Fri, 15 May 2015 15:56:56 +0200 (CEST)
Received: from grimnir.das-netzwerkteam.de (grimnir.das-netzwerkteam.de [78.46.204.98])
	by freya.das-netzwerkteam.de (Postfix) with ESMTPS id 8E852B24
	for <control@bugs.x2go.org>; Fri, 15 May 2015 15:56:56 +0200 (CEST)
Received: from localhost (localhost [127.0.0.1])
	by grimnir.das-netzwerkteam.de (Postfix) with ESMTP id 48AC63B978
	for <control@bugs.x2go.org>; Fri, 15 May 2015 15:56:56 +0200 (CEST)
X-Virus-Scanned: Debian amavisd-new at grimnir.das-netzwerkteam.de
Received: from grimnir.das-netzwerkteam.de ([127.0.0.1])
	by localhost (grimnir.das-netzwerkteam.de [127.0.0.1]) (amavisd-new, port 10024)
	with ESMTP id 38D24POvUHBN for <control@bugs.x2go.org>;
	Fri, 15 May 2015 15:56:56 +0200 (CEST)
Received: from grimnir.das-netzwerkteam.de (localhost [127.0.0.1])
	by grimnir.das-netzwerkteam.de (Postfix) with ESMTPS id DF3993B961
	for <control@bugs.x2go.org>; Fri, 15 May 2015 15:56:55 +0200 (CEST)
Received: from m-097.informatik.uni-kiel.de (m-097.informatik.uni-kiel.de
 [134.245.254.97]) by mail.das-netzwerkteam.de (Horde Framework) with HTTP;
 Fri, 15 May 2015 13:56:55 +0000
Date: Fri, 15 May 2015 13:56:55 +0000
Message-ID: <20150515135655.Horde.qdIcDRz0ptTgrylKsYLGKw6@mail.das-netzwerkteam.de>
From: Mike Gabriel <mike.gabriel@das-netzwerkteam.de>
To: control@bugs.x2go.org
User-Agent: Internet Messaging Program (IMP) H5 (6.2.2)
Accept-Language: de,en
Organization: DAS-NETZWERKTEAM
X-Originating-IP: 134.245.254.97
X-Remote-Browser: Mozilla/5.0 (X11; Linux x86_64; rv:32.0) Gecko/20100101
 Firefox/32.0 Iceweasel/32.0
Content-Type: multipart/signed; boundary="=_Y1uRAFCeX84LKAJmAmh-Sg9";
 protocol="application/pgp-signature"; micalg=pgp-sha1
MIME-Version: 1.0

This message is in MIME format and has been PGP signed.

--=_Y1uRAFCeX84LKAJmAmh-Sg9
Content-Type: text/plain; charset=UTF-8; format=flowed; DelSp=Yes
Content-Disposition: inline
Content-Transfer-Encoding: quoted-printable

unmerge #874
unmerge #875
merge #874 #49 #556
merge #875 #757 #758 #760
thanks


--=20

DAS-NETZWERKTEAM
mike=20gabriel, herweg 7, 24357 fleckeby
fon: +49 (1520) 1976 148

GnuPG Key ID 0x25771B31
mail: mike.gabriel@das-netzwerkteam.de, http://das-netzwerkteam.de

freeBusy:
https://mail.das-netzwerkteam.de/freebusy/m.gabriel%40das-netzwerkteam.de.x=
fb

--=_Y1uRAFCeX84LKAJmAmh-Sg9
Content-Type: application/pgp-signature
Content-Description: Digitale PGP-Signatur
Content-Disposition: inline

-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1

iQIcBAABAgAGBQJVVfsnAAoJEJr0azAldxsxd7oP/Rrkc/6P11LeJR4wRmbWJK0A
+I+iBu2yCDSAU0P6dbdbf0imfzyOQI1xs9UX1JeimwtU9wt5ePggCGPnyqjFid7f
vKCi+bNUv+fT4WLJJDa/tzGDUQPXFcyY/DaGHDUi111C8axLIpICpXZ6jg5fiaKe
jmEp6G+67zuJasS8nGUqzUKNqtfTq0uZ6tt2cIB+RD0cYtNqLV2MRAp45n2D3901
xAZyXh6jQsfTLxsM8DgxuqSOUcTCU7FLXPKUTSmSfaZaMAbfDh0P/VPANW/bShDr
6Cftv8jRxeljrZTG/kWi7GyosROEF4uLs0j1hhTgsj62RlS+a8zimgubTu5Q2j7P
sDOI4zFqUF+HLNa/RQggYAIpneY3+ZskLiD5V2l0HeKfeZZg1ADXT6iHAFf+ZqQ3
Yzi30Pac8lMSTSoYId+uL5k5Gj4GQpuMZd+P24+stGiZ5NByJOGCMNKztYg1Z61m
5S0ncKrlMsotWZvdg0Av6zInQhDv9SuLmIng3bCZBpxVDIJbsqLc0YNRLpaLGKU3
uleJxZwtQ5x1cXpzIVy5ad97I2l4AcTpKyPu1drxcQ6YaitMWSrFNXoJoPHl5b/9
+e3P7KIHBXtunD4gXAcQV2v3T3blMaxZJ9kQWF/Ykl1zx4MOv8MsItOaRSE+My16
HVKGBQ0sMs0DemBS50o9
=+kz9
-----END PGP SIGNATURE-----

--=_Y1uRAFCeX84LKAJmAmh-Sg9--

