[midPoint-git] [Evolveum/midpoint] 53c621: Merge Objects page extends PageAdminFocus

[honchar]

  Branch: refs/heads/master
  Home:   https://github.com/Evolveum/midpoint
  Commit: 53c62125a541205e332b3c1d19dc0b0d4be4fbce
      https://github.com/Evolveum/midpoint/commit/53c62125a541205e332b3c1d19dc0b0d4be4fbce
  Author: honchar <honchar at evolveum.com>
  Date:   2016-10-18 (Tue, 18 Oct 2016)

  Changed paths:
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/users/PageMergeObjects.html
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/users/PageMergeObjects.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/users/component/MergeObjectsPanel.html
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/users/component/MergeObjectsPanel.java
    M gui/admin-gui/src/main/resources/localization/Midpoint.properties

  Log Message:
  -----------
  Merge Objects page extends PageAdminFocus