Merge pull request #337 from brianjjones/master
authorRaphael Kubo da Costa <raphael.kubo.da.costa@intel.com>
Thu, 26 Jun 2014 21:36:53 +0000 (00:36 +0300)
committerRaphael Kubo da Costa <raphael.kubo.da.costa@intel.com>
Thu, 26 Jun 2014 21:36:53 +0000 (00:36 +0300)
Fix to make sure mediaserver properties are set


Trivial merge