Merge branch 'master' of github.com:kivitendo/kivitendo-erp
authorJan Büren <jan@kivitendo-premium.de>
Wed, 11 Mar 2015 14:57:19 +0000 (15:57 +0100)
committerJan Büren <jan@kivitendo-premium.de>
Wed, 11 Mar 2015 14:57:19 +0000 (15:57 +0100)

Trivial merge