tree b436b271e381132852077372ea4f65a3bdde56f3
parent 12b809b92848be99f1bfd2d823695fce35a8f130
parent 520d12ba0c67a1f62e975cf3289999a301474592
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>