Merge branch 'master' of https://github.com/kivitendo/kivitendo-erp
authorNiclas Zimmermann <niclas@kivitendo-premium.de>
Mon, 5 Aug 2013 12:44:54 +0000 (14:44 +0200)
committerNiclas Zimmermann <niclas@kivitendo-premium.de>
Mon, 5 Aug 2013 12:44:54 +0000 (14:44 +0200)

Trivial merge