Merge branch 'master' of ssh://oic/oic-resource
authorErich Keane <erich.keane@intel.com>
Sat, 11 Oct 2014 20:28:22 +0000 (13:28 -0700)
committerErich Keane <erich.keane@intel.com>
Sat, 11 Oct 2014 20:28:22 +0000 (13:28 -0700)
commitd05918703b8d7956918c96330bf5ab03d070791d
tree1a2d33b93859c8071d4916dd0c1b38e872086c7d
parent7e5b9d431a6ddf13c537c0e10bde0b7ecd866f19
parentcd59314f84258b63609975a9585c46abc116a876
Merge branch 'master' of ssh://oic/oic-resource