Merge branch 'master' of github.com:kivitendo/kivitendo-erp
authorNiclas Zimmermann <niclas@kivitendo-premium.de>
Tue, 5 Mar 2013 14:19:07 +0000 (15:19 +0100)
committerNiclas Zimmermann <niclas@kivitendo-premium.de>
Tue, 5 Mar 2013 14:19:07 +0000 (15:19 +0100)

Trivial merge