Merge branch 'master' of github.com:kivitendo/kivitendo-erp
authorHolger Lindemann <hli@debian7.lx-system.de>
Fri, 24 Jan 2014 09:09:33 +0000 (10:09 +0100)
committerHolger Lindemann <hli@debian7.lx-system.de>
Fri, 24 Jan 2014 09:09:33 +0000 (10:09 +0100)

Trivial merge