From 66190e1134676f3addf703b0424761c21cad7c52 Mon Sep 17 00:00:00 2001
From: Marius Cramer <m.cramer@pixcept.de>
Date: Wed, 14 Jan 2015 14:17:32 -0500
Subject: [PATCH] Merge branch 'master' into 'master'

---
 interface/web/mail/mail_domain_edit.php |    0 
 1 files changed, 0 insertions(+), 0 deletions(-)

diff --git a/interface/web/mail/mail_domain_edit.php b/interface/web/mail/mail_domain_edit.php
old mode 100755
new mode 100644

--
Gitblit v1.9.1