Merge branch 'master' into encryption
tree: cb01f51a2552c87dc1e22922c814f74a0e711e47
  1. hlrsync/
  2. linux-kernel/
  3. openbsc/
  4. wireshark/