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

Trivial merge