From: Roland Haeder <roland@mxchange.org>
Date: Sun, 9 Feb 2014 00:30:49 +0000 (+0100)
Subject: Merge branch 'master' of git.mxchange.org:/var/cache/git/repos/hub
X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=9bca5da674f858a9075bb7233ff046a9037aa25b;p=hub.git

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

Conflicts:
	core
---

9bca5da674f858a9075bb7233ff046a9037aa25b