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/gitweb/gitweb.cgi/mfinanz.git/commitdiff_plain/f3da2d8e75128e5b912d2ceddc680bea9552d19b?ds=inline;hp=-c

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

Conflicts:
	SL/Dispatcher.pm
---

f3da2d8e75128e5b912d2ceddc680bea9552d19b
diff --combined SL/Dispatcher.pm
index 2389b1100,da7ffef64..2f239524f
--- a/SL/Dispatcher.pm
+++ b/SL/Dispatcher.pm
@@@ -5,15 -5,18 +5,17 @@@ use strict
  BEGIN {
    unshift @INC, "modules/override"; # Use our own versions of various modules (e.g. YAML).
    push    @INC, "modules/fallback"; # Only use our own versions of modules if there's no system version.
 -  push    @INC, "SL";               # FCGI won't find modules that are not properly named. Help it by inclduging SL
  }
  
  use CGI qw( -no_xhtml);
+ use DateTime;
  use English qw(-no_match_vars);
  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;