Merge branch '1_2_X'
Conflicts:
core/pom.xml
pom.xml
Project: http://git-wip-us.apache.org/repos/asf/syncope/repo
Commit: http://git-wip-us.apache.org/repos/asf/syncope/commit/a5d2a923
Tree: http://git-wip-us.apache.org/repos/asf/syncope/tree/a5d2a923
Diff: http://git-wip-us.apache.org/repos/asf/syncope/diff/a5d2a923
Branch: refs/heads/SYNCOPE-156
Commit: a5d2a92347e2ce7271066b4fa9c35e5106dfc3ea
Parents: b3a79f4 86dedd3
Author: Francesco Chicchiriccò <[email protected]>
Authored: Thu Sep 17 08:57:32 2015 +0200
Committer: Francesco Chicchiriccò <[email protected]>
Committed: Thu Sep 17 08:57:32 2015 +0200
----------------------------------------------------------------------
----------------------------------------------------------------------