From: Niclas Zimmermann <niclas@kivitendo-premium.de>
Date: Thu, 18 Apr 2013 11:55:35 +0000 (+0200)
Subject: Merge branch 'master' of github.com:kivitendo/kivitendo-erp
X-Git-Tag: release-3.1.0beta1~494
X-Git-Url: http://wagnertech.de/git?a=commitdiff_plain;h=6c0a55aca160c95f56fd52196d946a0708a2c7b5;p=kivitendo-erp.git

Merge branch 'master' of github.com:kivitendo/kivitendo-erp

Behebt einfach nur Conflicts.

Conflicts:
	SL/TransNumber.pm
---

6c0a55aca160c95f56fd52196d946a0708a2c7b5