Merge branch 'master' of github.com:kivitendo/kivitendo-erp
authorJan Büren <jan@kivitendo-premium.de>
Wed, 6 Feb 2013 12:10:47 +0000 (13:10 +0100)
committerJan Büren <jan@kivitendo-premium.de>
Wed, 6 Feb 2013 12:10:47 +0000 (13:10 +0100)

Trivial merge