Merge branch 'master' of github.com:kivitendo/kivitendo-erp
authorNiclas Zimmermann <niclas@kivitendo-premium.de>
Fri, 5 Apr 2013 08:19:42 +0000 (10:19 +0200)
committerNiclas Zimmermann <niclas@kivitendo-premium.de>
Fri, 5 Apr 2013 08:19:42 +0000 (10:19 +0200)

Trivial merge