From: Bernd Bleßmann Date: Mon, 6 Jan 2014 13:57:22 +0000 (+0100) Subject: Merge branch 'master' of github.com:kivitendo/kivitendo-erp X-Git-Tag: release-3.1.0beta1~22^2~55^2~1 X-Git-Url: http://wagnertech.de/git?a=commitdiff_plain;h=eed2ea364f31c49d86ee4570759a987dc242483f;p=kivitendo-erp.git Merge branch 'master' of github.com:kivitendo/kivitendo-erp --- eed2ea364f31c49d86ee4570759a987dc242483f