From: Sven Schöling <s.schoeling@linet-services.de>
Date: Thu, 13 Jan 2011 15:47:01 +0000 (+0100)
Subject: Merge branch 'master' of git@lx-office.linet-services.de:lx-office-erp
X-Git-Tag: release-2.6.2beta2^2~5
X-Git-Url: http://wagnertech.de/git?a=commitdiff_plain;h=f3da2d8e75128e5b912d2ceddc680bea9552d19b;p=kivitendo-erp.git

Merge branch 'master' of git@lx-office.linet-services.de:lx-office-erp

Conflicts:
	SL/Dispatcher.pm
---

f3da2d8e75128e5b912d2ceddc680bea9552d19b
diff --cc SL/Dispatcher.pm
index 2389b1100,da7ffef64..2f239524f
--- a/SL/Dispatcher.pm
+++ b/SL/Dispatcher.pm
@@@ -13,7 -15,8 +14,8 @@@ use SL::Auth
  use SL::LXDebug;
  use SL::Locale;
  use SL::Common;
 +use SL::Form;
+ use SL::Helper::DateTime;
 -use Form;
  use List::Util qw(first);
  use File::Basename;