Merge "roomserver/client updated to demonstrate simple attribute support in collectio...
authorErich Keane <erich.keane@intel.com>
Sun, 26 Oct 2014 03:49:52 +0000 (20:49 -0700)
committerGerrit Code Review <gerrit@oicreview.vlan14.01.org>
Sun, 26 Oct 2014 03:49:52 +0000 (20:49 -0700)

Trivial merge