Merge branch 'master' of github.com:kivitendo/kivitendo-erp
authorJan Büren <jan@kivitendo-premium.de>
Thu, 28 Aug 2014 12:18:33 +0000 (14:18 +0200)
committerJan Büren <jan@kivitendo-premium.de>
Thu, 28 Aug 2014 12:18:33 +0000 (14:18 +0200)

Trivial merge