Merge branch 'master' of github.com:kivitendo/kivitendo-erp
authorNiclas Zimmermann <niclas@kivitendo-premium.de>
Thu, 7 Mar 2013 11:42:48 +0000 (12:42 +0100)
committerNiclas Zimmermann <niclas@kivitendo-premium.de>
Thu, 7 Mar 2013 11:42:48 +0000 (12:42 +0100)

Trivial merge