Merge branch 'master' of github.com:kivitendo/kivitendo-erp
authorJan Büren <jan@kivitendo-premium.de>
Thu, 30 Apr 2015 14:02:49 +0000 (16:02 +0200)
committerJan Büren <jan@kivitendo-premium.de>
Thu, 30 Apr 2015 14:02:49 +0000 (16:02 +0200)

Trivial merge