8 Commits (07f31e6b1e8d639763e292387563e3537bf8f022)

Author	SHA1	Message	Date
deajan	f8015b735a	Rendered merge BSD compatible	8 years ago
deajan	4c3aa02954	Updated common scripts	8 years ago
deajan	ce38085cac	Made merge output exit codes	8 years ago
deajan	7294fa8846	Updated common merge from other projects	8 years ago
deajan	fb53664877	Added systemd file, installer stats and ssh known host ignore option	9 years ago
deajan	8e74fd2bff	Added optional installer statistics	9 years ago
deajan	9c2df9990f	Merge script should take relative path for ofunctions	9 years ago
deajan	7875469a94	Initial upload of function merge	9 years ago