From: Roland Haeder <roland@mxchange.org>
Date: Mon, 11 May 2015 12:04:50 +0000 (+0200)
Subject: Merge branch 'master' of git.mxchange.org:/var/cache/git/repos/admin
X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=7953fae167d96fe9ef113db0627db933e4a5b113;p=admin.git

Merge branch 'master' of git.mxchange.org:/var/cache/git/repos/admin

Signed-off-by: Roland Haeder <roland@mxchange.org>

Conflicts:
	core
---

7953fae167d96fe9ef113db0627db933e4a5b113