am c73c4a36: (-s ours) am b37f7e59: Merge changes I81fc2f90,I5e7fd759

* commit 'c73c4a36d2cf5eb3eeeca97caca25c3920dbcfa0':
  Using proper key for removing from map.
  Removing wrong equals method in comparator.
tree: ad3cf2304e44d77a583ac28ff560bf9310fffd1a
  1. cmds/
  2. include/
  3. libs/
  4. opengl/
  5. services/
  6. vpn/
  7. MODULE_LICENSE_APACHE2
  8. NOTICE