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)
commitefb9a24f2252104ab4af5c25334119d7c5c70a8c
tree77fdafd595a5b05eeaedee3ded8d2586d875c4eb
parent0f0fc523e71c925c2dcc5b06b6e18ebea3c596a8
parent9ea9e4eecc964611216f199a4210c12ba7fe8235
Merge branch 'master' of github.com:kivitendo/kivitendo-erp