Merge branch 'master' of github.com:kivitendo/kivitendo-erp
authorG. Richardson <information@kivitendo-premium.de>
Fri, 24 Jan 2014 10:38:13 +0000 (11:38 +0100)
committerG. Richardson <information@kivitendo-premium.de>
Fri, 24 Jan 2014 10:38:13 +0000 (11:38 +0100)

Trivial merge