2 new commits pushed to

<https://github.com/jmpsec/osctrld/tree/develop|develop>

by javuto

<https://github.com/jmpsec/osctrld/commit/195ce55aed8a4a80abf557cef9935cf182740b12|195ce55a>

- Makefile job to merge develop into main

<https://github.com/jmpsec/osctrld/commit/89ff098c044d000ce355b82abdb85dc4c1916b22|89ff098c>

- Merge pull request #19 from jmpsec/makefile-develop-to-main jmpsec/osctrld