Merge branch 'master' of https://github.com/kivitendo/kivitendo-erp
authorAndreas Rudin <andreas.rudin@revamp-it.ch>
Thu, 30 Jun 2016 17:47:21 +0000 (19:47 +0200)
committerAndreas Rudin <andreas.rudin@revamp-it.ch>
Thu, 30 Jun 2016 17:47:21 +0000 (19:47 +0200)
commit737b3bdd3f0f38849d51162dc6f307a0d4a8da71
treed616f8316f79051f0cc604b2e035331b3807e48e
parentd2f731cac86e4590b46e990caf7bb5f7f717ccb6
parent4e0bef2d1ee1fa29e3fa85a97f34e707fe4e287d
Merge branch 'master' of https://github.com/kivitendo/kivitendo-erp