1. 8c49639 merge conflicts by Pankaj Berde · 11 years ago
  2. c2e95ee Merged registry code into master by Jonathan Hart · 11 years ago