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

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

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

Conflicts:
	core
---

828f4bde7750c1d9106b29da175cb5c54ebcbed0