[midPoint-git] [Evolveum/midpoint] ba8646: MID-2220 fix

[Erik Suta]

  Branch: refs/heads/master
  Home:   https://github.com/Evolveum/midpoint
  Commit: ba8646646a6229164237d65d17282ddca4a443bd
      https://github.com/Evolveum/midpoint/commit/ba8646646a6229164237d65d17282ddca4a443bd
  Author: Erik Suta <erik.suta at evolveum.com>
  Date:   2015-03-06 (Fri, 06 Mar 2015)

  Changed paths:
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/configuration/PageInternals.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/configuration/PageInternals.properties

  Log Message:
  -----------
  MID-2220 fix


  Commit: 548da2bed43142b6088d233bc67507b2b56c634a
      https://github.com/Evolveum/midpoint/commit/548da2bed43142b6088d233bc67507b2b56c634a
  Author: Erik Suta <erik.suta at evolveum.com>
  Date:   2015-03-06 (Fri, 06 Mar 2015)

  Changed paths:
    M dist/pom.xml
    M infra/test-util/src/main/java/com/evolveum/midpoint/test/util/TestUtil.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/controller/ModelController.java
    M model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/TestSecurity.java
    M testing/conntest/pom.xml
    M testing/conntest/src/test/java/com/evolveum/midpoint/testing/conntest/AbstractLdapConnTest.java
    M testing/conntest/src/test/java/com/evolveum/midpoint/testing/conntest/TestOpenLdap.java

  Log Message:
  -----------
  Merge branch 'master' of https://github.com/Evolveum/midpoint


Compare: https://github.com/Evolveum/midpoint/compare/0b27ea9d5c82...548da2bed431