Merge branch '1_2_X'

Conflicts:
        pom.xml


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

Branch: refs/heads/master
Commit: dad9e942ce594cd00fbef2cef06cffb3a2f71650
Parents: fe05db2 33fd037
Author: Francesco Chicchiriccò <[email protected]>
Authored: Tue Jun 16 14:48:00 2015 +0200
Committer: Francesco Chicchiriccò <[email protected]>
Committed: Tue Jun 16 14:48:00 2015 +0200

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

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


Reply via email to