Merge branch 'master' of github.com:kivitendo/kivitendo-erp
authorJan Büren <jan@kivitendo-premium.de>
Fri, 15 Mar 2013 12:53:16 +0000 (13:53 +0100)
committerJan Büren <jan@kivitendo-premium.de>
Fri, 15 Mar 2013 12:53:16 +0000 (13:53 +0100)

Trivial merge