[midPoint-git] midPoint branch master updated. v2.3devel-167-g4156d84

[Gabriela Polcova]

Project "midPoint" branch master has been updated
       via  4156d84fc1b5f992d99add741fac5c93b013c3e4 (commit) v2.3devel-167-g4156d84
       via  8d76e3f5befc7f10b92868305b6238ce3bf74f8a (commit) v2.3devel-165-g8d76e3f
      from  18fa248810709b2e3a5a190798310f0e04219ec3 (commit) v2.3devel-165-g18fa248

- Log -----------------------------------------------------------------
commit 4156d84fc1b5f992d99add741fac5c93b013c3e4
Merge: 8d76e3f 18fa248
Author: Gabriela Polcova <gabriela.polcova at evolveum.com>
Date:   Mon Nov 11 16:32:42 2013 +0100

    Merge branch 'master' of git.evolveum.com:/srv/git/projects/midpoint

commit 8d76e3f5befc7f10b92868305b6238ce3bf74f8a
Author: Gabriela Polcova <gabriela.polcova at evolveum.com>
Date:   Mon Nov 11 16:31:38 2013 +0100

    sql scripts - upgrade 2.2-to-2.2.1

-----------------------------------------------------------------------

(Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full)

Summary of changes:
 ...-2.2-to-2.3.sql => h2-upgrade-2.2-to-2.2.1.sql} |    0
 ...2-to-2.3.sql => mysql-upgrade-2.2-to-2.2.1.sql} |    0
 ...-to-2.3.sql => oracle-upgrade-2.2-to-2.2.1.sql} |    0
 ...2.3.sql => postgresql-upgrade-2.2-to-2.2.1.sql} |    0
 ...-2.3.sql => sqlserver-upgrade-2.2-to-2.2.1.sql} |    0
 .../midpoint/model/controller/ModelController.java |    2 +-
 6 files changed, 1 insertion(+), 1 deletion(-)
 copy config/{h2-upgrade-2.2-to-2.3.sql => h2-upgrade-2.2-to-2.2.1.sql} (100%)
 copy config/{mysql-upgrade-2.2-to-2.3.sql => mysql-upgrade-2.2-to-2.2.1.sql} (100%)
 copy config/{oracle-upgrade-2.2-to-2.3.sql => oracle-upgrade-2.2-to-2.2.1.sql} (100%)
 copy config/{postgresql-upgrade-2.2-to-2.3.sql => postgresql-upgrade-2.2-to-2.2.1.sql} (100%)
 copy config/{sqlserver-upgrade-2.2-to-2.3.sql => sqlserver-upgrade-2.2-to-2.2.1.sql} (100%)


hooks/post-receive
-- 
midPoint