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

Trivial merge