Merge branch 'master' of vc.linet-services.de:public/lx-office-erp
authorThomas Heck <theck@linet-services.de>
Wed, 5 Sep 2012 12:36:34 +0000 (14:36 +0200)
committerThomas Heck <theck@linet-services.de>
Wed, 5 Sep 2012 12:36:34 +0000 (14:36 +0200)
1  2 
SL/Template/Plugin/L.pm
templates/webpages/background_job/form.html

Simple merge