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
  Änderungen können nicht gespeichert werden, solange der OpenVPN-Server läuft.


Michael

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