Merge branch 'master' of github.com:kivitendo/kivitendo-erp
authorNiclas Zimmermann <niclas@kivitendo-premium.de>
Mon, 15 Apr 2013 15:55:21 +0000 (17:55 +0200)
committerNiclas Zimmermann <niclas@kivitendo-premium.de>
Mon, 15 Apr 2013 15:55:21 +0000 (17:55 +0200)

Trivial merge