Merge branch 'master' of github.com:kivitendo/kivitendo-erp
authorJan Büren <jan@kivitendo-premium.de>
Tue, 24 Feb 2015 13:15:19 +0000 (14:15 +0100)
committerJan Büren <jan@kivitendo-premium.de>
Tue, 24 Feb 2015 13:15:19 +0000 (14:15 +0100)
commitc1c1deac96aea0d5cbab766df7ff7ead9796f515
tree19873924c9e547aa8111d47e6a88ff6e72f46a98
parent34420ddb07d6ebea006aa96f131aaa050a7037bc
parent4e68be5050c432d977359c3beb3d159c0bca9cda
Merge branch 'master' of github.com:kivitendo/kivitendo-erp