Merge branch 'master' of https://github.com/wagner-tech/kivitendo-erp
authorMichael Wagner <info@wagnertech.de>
Wed, 9 Mar 2016 13:06:48 +0000 (14:06 +0100)
committerMichael Wagner <info@wagnertech.de>
Wed, 9 Mar 2016 13:06:48 +0000 (14:06 +0100)
commit7555773739acb7e65602bff163ab4f9548e0f19a
treedc58f435313abd435ae5d5dcd71b04ce46137d54
parent74f6ccaa7a3bfcd1a4c3952c211de5e6a54fbf01
parentb371d63ff58d17fd34bdab66d48afdd09d5b57db
Merge branch 'master' of https://github.com/wagner-tech/kivitendo-erp