am 7063eb10: (-s ours) am dc36da51: Merge "Trim unwanted whitespace from translations.  DO NOT MERGE" into gingerbread

Merge commit '7063eb104657d1fa3f5e030b4657a9541ec6b054'

* commit '7063eb104657d1fa3f5e030b4657a9541ec6b054':
  Trim unwanted whitespace from translations.  DO NOT MERGE
tree: 355bbde30004c085072c85fa7f9e54c1710673b1
  1. cmds/
  2. include/
  3. libs/
  4. opengl/
  5. services/
  6. vpn/
  7. MODULE_LICENSE_APACHE2
  8. NOTICE