Merge branch 'master' of github.com:kivitendo/kivitendo-erp
authorSven Schöling <s.schoeling@linet-services.de>
Mon, 15 Jul 2013 16:49:53 +0000 (18:49 +0200)
committerSven Schöling <s.schoeling@linet-services.de>
Mon, 15 Jul 2013 16:49:53 +0000 (18:49 +0200)
commite4b304dc48811f510271de1a3ea242ce1cb30654
tree3602de1f1c04e1897708eaecd1e166d19a3828a0
parent29379d95dee7886c804cc695a710bbb4f08c1be6
parent69c1212c098cd2ba8235bfdcb01c990fa553bb1d
Merge branch 'master' of github.com:kivitendo/kivitendo-erp

Conflicts:
SL/Template/Plugin/JavaScript.pm