am 49b73385: am ff3ead50: (-s ours) am e3b05d09: Merge "Tweaks for forward-compatibility"

* commit '49b73385146cb566e242c63abc3c3781750bec43':
  Tweaks for forward-compatibility
tree: c16c788b2e7a62de5b85b9fecf5b9b2674e76c8f
  1. cmds/
  2. include/
  3. libs/
  4. opengl/
  5. services/
  6. vpn/
  7. MODULE_LICENSE_APACHE2
  8. NOTICE