Merge branch 'bankerweiterung_und_skonto'
authorG. Richardson <information@kivitendo-premium.de>
Thu, 7 May 2015 08:36:14 +0000 (10:36 +0200)
committerG. Richardson <information@kivitendo-premium.de>
Thu, 7 May 2015 08:36:14 +0000 (10:36 +0200)
commit3624b119556731da41e4ad395491ebb067f26565
tree774d10f50ec0803d2293ef5b6a9adaaecc7f4b5f
parent781dbd51ba3f122f5d9d5572b89719679030e0ff
parent36ee5173432680ecfe5c7de3633502888b84ca3e
Merge branch 'bankerweiterung_und_skonto'

Conflicts:
locale/de/all
locale/de/all