Merge branch 'master' of github.com:kivitendo/kivitendo-erp
authorHolger Lindemann <hli@debian7.lx-system.de>
Thu, 16 Jan 2014 14:29:37 +0000 (15:29 +0100)
committerHolger Lindemann <hli@debian7.lx-system.de>
Thu, 16 Jan 2014 14:29:37 +0000 (15:29 +0100)

Trivial merge