Merge branch 'master' of github.com:kivitendo/kivitendo-erp
authorG. Richardson <information@kivitendo-premium.de>
Mon, 20 Jan 2014 13:35:36 +0000 (14:35 +0100)
committerG. Richardson <information@kivitendo-premium.de>
Mon, 20 Jan 2014 13:35:36 +0000 (14:35 +0100)
commite7377248c81173d4da61913bc6e8e0a2eefb0891
treec58bd5c94d96f087c4786693a5c8756753fc8284
parent935b8083e67fa9b2871ae0f6a3ea5b8ca1661172
parentccb40ac450d3094ebc5b544e75ccacdc27f47aee
Merge branch 'master' of github.com:kivitendo/kivitendo-erp