Merge branch 'master' of github.com:kivitendo/kivitendo-erp
authorG. Richardson <information@kivitendo-premium.de>
Mon, 20 Jan 2014 12:07:37 +0000 (13:07 +0100)
committerG. Richardson <information@kivitendo-premium.de>
Mon, 20 Jan 2014 12:07:37 +0000 (13:07 +0100)
commit935b8083e67fa9b2871ae0f6a3ea5b8ca1661172
treecf2cc51994dd93e33f0e2d8b54cb2d035c8a82c8
parent99bbf349b825fc48cdb71288e0979ab687770227
parent429072104757330f631498ce97423c015cd88cf4
Merge branch 'master' of github.com:kivitendo/kivitendo-erp