Tyler Gunn 9561e7410b Prevent merging conference calls hosted on peer device.
automerge: 6b91ebf

* commit '6b91ebf58c928987ead635bb1c49a16965d4c835':
  Prevent merging conference calls hosted on peer device.
2015-04-14 18:19:11 +00:00
..