From mboxrd@z Thu Jan  1 00:00:00 1970
From: Michael Tremer <michael.tremer@ipfire.org>
To: development@lists.ipfire.org
Subject: Re: ccdfix-21-11-2012
Date: Fri, 23 Nov 2012 12:44:14 +0100
Message-ID: <1353671054.14956.23.camel@rice-oxley.tremer.info>
In-Reply-To: <50ACA295.9050909@oab.de>
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="===============8797691094533638042=="
List-Id: <development.lists.ipfire.org>

--===============8797691094533638042==
Content-Type: text/plain; charset="utf-8"
Content-Transfer-Encoding: quoted-printable

I cannot merge your branch because of conflicts.

So here are some things that need to be fixed:

Rebase the branch to origin/next and please edit the commit messages,
which are just not helpful. Read this for a short introduction about
good commit messages:
http://tbaggery.com/2008/04/19/a-note-about-git-commit-messages.html

Translation strings must be:
  You are not able to save any changes while the OpenVPN server is running.
and
  =C3=84nderungen k=C3=B6nnen nicht gespeichert werden, solange der OpenVPN-S=
erver l=C3=A4uft.


Michael

On Wed, 2012-11-21 at 10:44 +0100, Alexander Marx wrote:
> Dear List!
>=20
> i fixed all Bugs which are known by now.
>=20
> Changes are already in my Git repository, branch ccdfix.
>=20
> Attached the package files which are tested on core 64.
>=20
> Except the mtu-disc- bug all things are tested with Windows 7 and
> linux mint12 client.
> I found no more bugs. Please test it.
>=20
> --=20
>=20
>=20
> Alexander Marx
>=20
>=20
> Fachinformatiker Systemintegration
>=20
>=20
>=20
>=20
> _______________________________________________
> Development mailing list
> Development(a)lists.ipfire.org
> http://lists.ipfire.org/mailman/listinfo/development


--===============8797691094533638042==--