[midPoint-svn] Evolveum OpenICF branch master updated. emark-61-g47c99c4

[Radovan Semancik]

Project "Evolveum OpenICF" branch master has been updated
       via  47c99c46798f8a53614590cb2c7e8bb3f9560ad0 (commit) emark-61-g47c99c4
       via  c7260552fe167d5dde47e3347dc51d10f6f1792c (commit) emark-44-gc726055
       via  c6b00f30cb300d356b92bb7d9a021f4fa287747b (commit) emark-34-gc6b00f3
      from  9de950d1416bcdab8d08d6b12fbc6bc61edacebe (commit) emark-58-g9de950d

- Log -----------------------------------------------------------------
commit 47c99c46798f8a53614590cb2c7e8bb3f9560ad0
Merge: c726055 9de950d
Author: Radovan Semancik <radovan.semancik at evolveum.com>
Date:   Tue Sep 10 15:19:32 2013 +0200

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

commit c7260552fe167d5dde47e3347dc51d10f6f1792c
Merge: c6b00f3 1b187f5
Author: Radovan Semancik <radovan.semancik at evolveum.com>
Date:   Tue Sep 10 15:18:18 2013 +0200

    Merge branch 'master' of git.evolveum.com:/srv/git/projects/openicf
    
    Conflicts:
    	connectors/java/csvfile/src/main/java/org/forgerock/openicf/csvfile/CSVFileConnector.java

commit c6b00f30cb300d356b92bb7d9a021f4fa287747b
Author: Radovan Semancik <radovan.semancik at evolveum.com>
Date:   Mon Sep 2 15:51:12 2013 +0200

    Possible implemenation of script arguments (as environment variables).

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

(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:
 .../openicf/csvfile/CSVFileConnector.java          |   15 ++++++++++++++-
 1 file changed, 14 insertions(+), 1 deletion(-)


hooks/post-receive
-- 
Evolveum OpenICF