From b673617734d3d2370c314d3b36412a3e7ded5a4c Mon Sep 17 00:00:00 2001
From: Michael Hierweck <michael.hierweck@hostsharing.net>
Date: Wed, 31 Oct 2012 14:23:53 +0100
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 hsarweb/src/texts/emailalias_de.properties |    3 ++-
 1 files changed, 2 insertions(+), 1 deletions(-)

diff --git a/hsarweb/src/texts/emailalias_de.properties b/hsarweb/src/texts/emailalias_de.properties
index ec50929..6b385f5 100644
--- a/hsarweb/src/texts/emailalias_de.properties
+++ b/hsarweb/src/texts/emailalias_de.properties
@@ -5,4 +5,5 @@
 moduletitle=EMail Aliases
 moduleicon=../runo/icons/16/email-send.png
 new=EMail-Alias anlegen
-update=EMail-Alias �ndern
\ No newline at end of file
+update=EMail-Alias �ndern
+delete=EMail-Alias l�schen
\ No newline at end of file

--
Gitblit v1.9.0-SNAPSHOT