Merge branch 'master' of github.com:kivitendo/kivitendo-erp
authorJan Büren <jan@kivitendo-premium.de>
Tue, 14 Oct 2014 17:26:55 +0000 (19:26 +0200)
committerJan Büren <jan@kivitendo-premium.de>
Tue, 14 Oct 2014 17:26:55 +0000 (19:26 +0200)
commitc6197636591218179ef7875dc8a648bc88cdc833
tree19975834fa2b0ee6bb27fba9bc5be276addda204
parentba816a702284a7f5a78c4999b0df89749328f806
parentab36799f821da4080a2d53654b36521a03240018
Merge branch 'master' of github.com:kivitendo/kivitendo-erp