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)

Trivial merge