Merge branch 'master' of github.com:kivitendo/kivitendo-erp
authorG. Richardson <information@kivitendo-premium.de>
Fri, 24 Jan 2014 10:38:13 +0000 (11:38 +0100)
committerG. Richardson <information@kivitendo-premium.de>
Fri, 24 Jan 2014 10:38:13 +0000 (11:38 +0100)
commitcb1341a6715ae92b278b49d8b14eee7d4018859e
tree631a71e1d269c80a210dc805aaeb54f2ba6cf69a
parente7377248c81173d4da61913bc6e8e0a2eefb0891
parent846a322f70e71c5d0338f13eeea842d0f87c5ae3
Merge branch 'master' of github.com:kivitendo/kivitendo-erp