Merge branch 'master' of github.com:kivitendo/kivitendo-erp
authorJan Büren <jan@kivitendo-premium.de>
Thu, 4 Sep 2014 07:11:16 +0000 (09:11 +0200)
committerJan Büren <jan@kivitendo-premium.de>
Thu, 4 Sep 2014 07:11:16 +0000 (09:11 +0200)
commit164570bd39ebce873bac5f899d392003ef915ea1
tree7eca84107308adf9cb1a8401d3740c7e7c5f132d
parent406563ed1b78806f09febe49fc37f0b9fb97e6b5
parent99d8aaf4fd6df466ee540770cc7e80ae724dd4ad
Merge branch 'master' of github.com:kivitendo/kivitendo-erp