Merge branch 'master' of github.com:kivitendo/kivitendo-erp
authorSven Schöling <s.schoeling@linet-services.de>
Mon, 6 Jan 2014 15:44:35 +0000 (16:44 +0100)
committerSven Schöling <s.schoeling@linet-services.de>
Mon, 6 Jan 2014 15:44:35 +0000 (16:44 +0100)
commit3ec63dab8cfe1cd0981342870de4f8da4163b88e
treec50e8ad867e1ec77be6c48d7193e9bc090133751
parent4c7aa52e134459ea19a1fe318506962295cfe5a5
parentd5959d7e55714a2f499d7dea6ed33145f6176311
Merge branch 'master' of github.com:kivitendo/kivitendo-erp