Merge branch 'master' of github.com:kivitendo/kivitendo-erp
authorG. Richardson <information@kivitendo-premium.de>
Mon, 6 Jan 2014 18:19:44 +0000 (19:19 +0100)
committerG. Richardson <information@kivitendo-premium.de>
Mon, 6 Jan 2014 18:19:44 +0000 (19:19 +0100)

Trivial merge