Merge branch 'v2.0' 20/1820/1
authorKiran Kashalkar <kiran.kashalkar@riftio.com>
Fri, 12 May 2017 20:50:45 +0000 (20:50 +0000)
committerKiran Kashalkar <kiran.kashalkar@riftio.com>
Fri, 12 May 2017 20:50:45 +0000 (20:50 +0000)
commitf32a4bdd144eefe6e5e112b7359d3d26b4ff5bbb
tree0700350eb60c76a04b19f1f60cadff33a169ade1
parent43ed27435ffec8370493513400a990bc1541f584
parentb18062468e96aba7b1f6350f3f18b1d248ec699f
Merge branch 'v2.0'