Merge branch 'master' of https://github.com/kivitendo/kivitendo-erp
authorNiclas Zimmermann <niclas@kivitendo-premium.de>
Thu, 18 Jul 2013 07:30:28 +0000 (09:30 +0200)
committerNiclas Zimmermann <niclas@kivitendo-premium.de>
Thu, 18 Jul 2013 07:30:28 +0000 (09:30 +0200)
commit6ac47be4e3e318ea212ca595195b0b55a9c386a3
tree90377524bbeb5c665d9635050b247431092688ce
parent93a41d3921432dd6700d5fb2766ce8e92fe33901
parent9efca844f6b8086d64589b4cecbf5b76a120afd0
Merge branch 'master' of https://github.com/kivitendo/kivitendo-erp