Merge branch 'master' of github.com:kivitendo/kivitendo-erp
authorMartin Helmling <MartinHelmling@octo-soft.de>
Tue, 7 Jan 2014 07:57:57 +0000 (08:57 +0100)
committerMartin Helmling <MartinHelmling@octo-soft.de>
Tue, 7 Jan 2014 07:57:57 +0000 (08:57 +0100)
commit4268b3d512c4d970c5735fb18d5a62f00a345597
tree86f264d7d0cb6fb2f27364c66c8c6e5cc20237cb
parent7e9e54a0957691f86a0748c445d1e46a1e1aab31
parenta473872b10c9413761dc38580bb376bb505367a0
Merge branch 'master' of github.com:kivitendo/kivitendo-erp