Merge branch 'master' of github.com:kivitendo/kivitendo-erp
authorJan Büren <jan@kivitendo-premium.de>
Wed, 12 Jun 2013 08:19:41 +0000 (10:19 +0200)
committerJan Büren <jan@kivitendo-premium.de>
Wed, 12 Jun 2013 08:19:41 +0000 (10:19 +0200)

Trivial merge