Merge branch 'master' of github.com:kivitendo/kivitendo-erp
authorJan Büren <jan@kivitendo-premium.de>
Mon, 6 Jan 2014 13:14:10 +0000 (14:14 +0100)
committerJan Büren <jan@kivitendo-premium.de>
Mon, 6 Jan 2014 13:14:10 +0000 (14:14 +0100)
commit08e4ce1ef5caa3f7007d8c97e9e97ef83378b19a
tree25ab1ae1db6959dca438280864fa1ca852b195a8
parent4624b92aaf7520ff7f2d1ca6aa9abb295d1e01ca
parent0ff2b7fccc733d3b9a94a6069912f82d215d3062
Merge branch 'master' of github.com:kivitendo/kivitendo-erp