Merge branch 'master' of github.com:kivitendo/kivitendo-erp
authorMartin Helmling <MartinHelmling@octo-soft.de>
Mon, 6 Jan 2014 10:49:02 +0000 (11:49 +0100)
committerMartin Helmling <MartinHelmling@octo-soft.de>
Mon, 6 Jan 2014 10:49:02 +0000 (11:49 +0100)
commit91c75fc31bb8bb1505bcfbc9a2507cd5a8921766
tree1ed721c41c0e9b03c7f5e9ffe25beb7c22a620b7
parent21756d8bac54c5a75ddc71f112913a340954f1cc
parentbadc07590299ec3205ecb49019228a7f9452a6a3
Merge branch 'master' of github.com:kivitendo/kivitendo-erp