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

Trivial merge