Merge branch 'master' of github.com:kivitendo/kivitendo-erp
authorNiclas Zimmermann <niclas@kivitendo-premium.de>
Thu, 18 Apr 2013 11:55:35 +0000 (13:55 +0200)
committerNiclas Zimmermann <niclas@kivitendo-premium.de>
Thu, 18 Apr 2013 11:55:35 +0000 (13:55 +0200)
commit6c0a55aca160c95f56fd52196d946a0708a2c7b5
tree6ca415823a505c106952258d5075e8b4cde60ea9
parent6bb3a6152b33e37736b3e5ed855a830182ae0193
parentc322b02aa716b4c27ca66bf9b4c1177f0a0996d8
Merge branch 'master' of github.com:kivitendo/kivitendo-erp

Behebt einfach nur Conflicts.

Conflicts:
SL/TransNumber.pm