Merge branch 'master' of git@lx-office.linet-services.de:lx-office-erp
authorSven Schöling <s.schoeling@linet-services.de>
Thu, 13 Jan 2011 15:47:01 +0000 (16:47 +0100)
committerSven Schöling <s.schoeling@linet-services.de>
Thu, 13 Jan 2011 15:47:01 +0000 (16:47 +0100)
commitf3da2d8e75128e5b912d2ceddc680bea9552d19b
tree86a800059620f7ba817a788be59d6c8471803a54
parent12dadc47affa16838fe12aaf3e5523fa8b48e9ae
parent24f530ced23c4acab71ac8e37408dbba9d788ef2
Merge branch 'master' of git@lx-office.linet-services.de:lx-office-erp

Conflicts:
SL/Dispatcher.pm
SL/Dispatcher.pm