Merge branch 'master' of github.com:kivitendo/kivitendo-erp
authorNiclas Zimmermann <niclas@kivitendo-premium.de>
Fri, 14 Jun 2013 09:29:13 +0000 (11:29 +0200)
committerNiclas Zimmermann <niclas@kivitendo-premium.de>
Fri, 14 Jun 2013 09:29:13 +0000 (11:29 +0200)

Trivial merge