[52/59] [abbrv] syncope git commit: Merge branch 'master' into 2_0_X

Mon, 16 Feb 2015 00:06:54 -0800 

Merge branch 'master' into 2_0_X

Conflicts:
        
core/src/main/java/org/apache/syncope/core/persistence/beans/membership/MAttr.java


Project: http://git-wip-us.apache.org/repos/asf/syncope/repo
Commit: http://git-wip-us.apache.org/repos/asf/syncope/commit/094e68f3
Tree: http://git-wip-us.apache.org/repos/asf/syncope/tree/094e68f3
Diff: http://git-wip-us.apache.org/repos/asf/syncope/diff/094e68f3

Branch: refs/heads/master
Commit: 094e68f3744f78142bbfa856deb89e9406000211
Parents: 2d19463 36327a9
Author: Francesco Chicchiriccò <[email protected]>
Authored: Fri Feb 13 13:06:48 2015 +0100
Committer: Francesco Chicchiriccò <[email protected]>
Committed: Fri Feb 13 13:06:48 2015 +0100

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

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

Reply via email to