Merge branch 'master' of https://github.com/kivitendo/kivitendo-erp
authorNiclas Zimmermann <niclas@kivitendo-premium.de>
Mon, 6 Jan 2014 17:59:33 +0000 (18:59 +0100)
committerNiclas Zimmermann <niclas@kivitendo-premium.de>
Mon, 6 Jan 2014 17:59:33 +0000 (18:59 +0100)

Trivial merge