Merge branch 'master' of github.com:kivitendo/kivitendo-erp
authorG. Richardson <information@kivitendo-premium.de>
Mon, 20 Jan 2014 13:35:36 +0000 (14:35 +0100)
committerG. Richardson <information@kivitendo-premium.de>
Mon, 20 Jan 2014 13:35:36 +0000 (14:35 +0100)

Trivial merge