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

Trivial merge