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