am 6d13b146: am e78a0009: resolved conflicts for merge of 4b94c451 to stage-korg-master

* commit '6d13b146e0444f40f45b9fe5812093c5e611b68e':
  Added dropbox broadcast notification
tree: 66d37e7af33b650dfc2e6ffb05d5762f6455fe3e
  1. cmds/
  2. include/
  3. libs/
  4. opengl/
  5. services/
  6. vpn/
  7. MODULE_LICENSE_APACHE2
  8. NOTICE