[midPoint-git] [Evolveum/midpoint] 564c65: Fixing sample syntax

[Radovan Semancik]

  Branch: refs/heads/master
  Home:   https://github.com/Evolveum/midpoint
  Commit: 564c652b08d5e287afb47633b6978083a0e3d029
      https://github.com/Evolveum/midpoint/commit/564c652b08d5e287afb47633b6978083a0e3d029
  Author: Radovan Semancik <radovan.semancik at evolveum.com>
  Date:   2016-05-04 (Wed, 04 May 2016)

  Changed paths:
    M samples/evolveum/resource-openldap.xml

  Log Message:
  -----------
  Fixing sample syntax


  Commit: 8237be3b941ce805d095a1a9914603f33717a1fc
      https://github.com/Evolveum/midpoint/commit/8237be3b941ce805d095a1a9914603f33717a1fc
  Author: Radovan Semancik <radovan.semancik at evolveum.com>
  Date:   2016-05-04 (Wed, 04 May 2016)

  Changed paths:
    M gui/admin-gui/src/main/resources/localization/Midpoint_cs_CZ.properties
    M gui/admin-gui/src/main/resources/localization/Midpoint_de_DE.properties
    M gui/admin-gui/src/main/resources/localization/Midpoint_es_AR.properties
    M gui/admin-gui/src/main/resources/localization/Midpoint_es_ES.properties
    M gui/admin-gui/src/main/resources/localization/Midpoint_et_EE.properties
    M gui/admin-gui/src/main/resources/localization/Midpoint_sk_SK.properties
    M gui/admin-gui/src/main/resources/localization/Midpoint_tr_TR.properties

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


  Commit: bfdedcc602a08ebb0c718f9b9d4de3b621c9df5d
      https://github.com/Evolveum/midpoint/commit/bfdedcc602a08ebb0c718f9b9d4de3b621c9df5d
  Author: Radovan Semancik <radovan.semancik at evolveum.com>
  Date:   2016-05-04 (Wed, 04 May 2016)

  Changed paths:
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/users/component/AssociationValueChoicePanel.html

  Log Message:
  -----------
  Association editor styles


Compare: https://github.com/Evolveum/midpoint/compare/4d778adf4f54...bfdedcc602a0