Merge branch 'master' of github.com:kivitendo/kivitendo-erp
authorSven Schöling <s.schoeling@linet-services.de>
Mon, 6 Jan 2014 13:09:31 +0000 (14:09 +0100)
committerSven Schöling <s.schoeling@linet-services.de>
Mon, 6 Jan 2014 13:09:31 +0000 (14:09 +0100)
commit0ff2b7fccc733d3b9a94a6069912f82d215d3062
tree25ab1ae1db6959dca438280864fa1ca852b195a8
parent74a70e2abde806043aa9fa5a90ca47532b927a97
parent4fdbfa7df4c1f89cdb0d3d3266b5908ac67c3f15
Merge branch 'master' of github.com:kivitendo/kivitendo-erp