wagnertech.de Git - kivitendo-erp.git/commit

author	G. Richardson <information@kivitendo-premium.de>
	Tue, 5 May 2015 07:56:42 +0000 (09:56 +0200)
committer	G. Richardson <information@kivitendo-premium.de>
	Tue, 5 May 2015 07:56:42 +0000 (09:56 +0200)
commit	a87694dc525b4eabff11029f1e5401621e2bd3bc
tree	fefedb29290507b77ebfa61e325f8ea72e07b371	tree \| snapshot
parent	4b7f17c8d92bff2e9f495d476a650dc3897c3097	commit \| diff
parent	fc35d1dd4441b0dd26fe0b1b397cc66508a715f3	commit \| diff

Merge branch 'bankerweiterung_und_skonto'

Conflicts:
doc/changelog
locale/de/all

Unnamed repository; edit this file 'description' to name the repository.