am 95be7c68: IMS: Conference changes
Uma Maheswari Ramalingam [Thu, 11 Jun 2015 17:08:05 +0000 (17:08 +0000)]
* commit '95be7c68495a3a22c45b8d7867bf5c0246513adb':
  IMS: Conference changes


Trivial merge