[midPoint-git] Evolveum OpenICF branch master updated. emark-133-g00fc2ea

[Pavol Mederly]

Project "Evolveum OpenICF" branch master has been updated
       via  00fc2ea5ae62c8d9967eaea80f1281c2d5a38abe (commit) emark-133-g00fc2ea
      from  5f156424c7376f569a8b5db37afc63d8f0b16f4b (commit) emark-132-g5f15642

- Log -----------------------------------------------------------------
commit 00fc2ea5ae62c8d9967eaea80f1281c2d5a38abe
Author: Pavol Mederly <mederly at evolveum.com>
Date:   Tue Mar 25 10:17:53 2014 +0100

    Resolved merge conflicts.

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

(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:
 .../ActiveDirectoryConnector.cs                    |  111 +-----------
 .../ActiveDirectoryUtils.cs                        |    6 +-
 .../CustomAttributeHandlers.cs                     |  189 ++++----------------
 .../dotnet/ExchangeConnector/ExchangeConnector.cs  |  136 +-------------
 .../dotnet/ExchangeConnector/RunSpaceInstance.cs   |   37 ----
 5 files changed, 41 insertions(+), 438 deletions(-)


hooks/post-receive
-- 
Evolveum OpenICF