am 22a17ce6: (-s ours) am b1f5a54a: Merge "VCard refactoring backport." into gingerbread

Merge commit '22a17ce60b5e8770ad950cc3da6d8f5a2be3b879'

* commit '22a17ce60b5e8770ad950cc3da6d8f5a2be3b879':
  VCard refactoring backport.
tree: a5b01e7714e08c28da6d945bea0296d013cbaccf
  1. cmds/
  2. include/
  3. libs/
  4. opengl/
  5. services/
  6. vpn/
  7. MODULE_LICENSE_APACHE2
  8. NOTICE