Merge branch 'master' of github.com:kivitendo/kivitendo-erp
authorNiclas Zimmermann <niclas@kivitendo-premium.de>
Fri, 15 Mar 2013 09:29:40 +0000 (10:29 +0100)
committerNiclas Zimmermann <niclas@kivitendo-premium.de>
Fri, 15 Mar 2013 09:29:40 +0000 (10:29 +0100)

Trivial merge