Merge branch 'master' of https://github.com/kivitendo/kivitendo-erp
authorAndreas Rudin <andreas.rudin@revamp-it.ch>
Fri, 24 Jun 2016 20:47:52 +0000 (22:47 +0200)
committerAndreas Rudin <andreas.rudin@revamp-it.ch>
Fri, 24 Jun 2016 20:47:52 +0000 (22:47 +0200)

Trivial merge