Merge branch 'master' of github.com:kivitendo/kivitendo-erp
authorJan Büren <jan@kivitendo-premium.de>
Thu, 22 Jan 2015 15:08:03 +0000 (16:08 +0100)
committerJan Büren <jan@kivitendo-premium.de>
Thu, 22 Jan 2015 15:08:03 +0000 (16:08 +0100)

Trivial merge