Merge branch 'master' of github.com:kivitendo/kivitendo-erp
authorSven Schöling <s.schoeling@linet-services.de>
Wed, 1 Apr 2015 13:36:03 +0000 (15:36 +0200)
committerSven Schöling <s.schoeling@linet-services.de>
Wed, 1 Apr 2015 13:36:03 +0000 (15:36 +0200)
commit778622af7e8da4a1eec0c2a6719ed79e2f1bfe4d
treed91026181d8df32bfa8f3ba4c9bc3e94db5d7024
parentc3b778ec8ff1499a8a2f2247e47544ad784956a0
parent7a631f440d7298ae4cd77e0d9bc08e04b8f42e3a
Merge branch 'master' of github.com:kivitendo/kivitendo-erp