tree b436b271e381132852077372ea4f65a3bdde56f3
parent 0ed98503189030f9f1787037b23a26fcc4ecb109
parent 81e7ba58f7b5f3a169a0bbc7640a04b52e5e4722
author sinhan <nandan.sinha@riftio.com> 1493232163 +0000
committer sinhan <nandan.sinha@riftio.com> 1493248160 +0000

Merge branch 'pm_phase2' into v2.0

Signed-off-by: sinhan <nandan.sinha@riftio.com>