[3/3] syncope git commit: Merge branch '1_2_X'

[ilgrosso]

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/e5459285
Tree: http://git-wip-us.apache.org/repos/asf/syncope/tree/e5459285
Diff: http://git-wip-us.apache.org/repos/asf/syncope/diff/e5459285

Branch: refs/heads/master
Commit: e54592850c95cde8d26f2182f41fe5ce21398512
Parents: 4412ac7 39eb575
Author: Francesco Chicchiriccò <ilgro...@apache.org>
Authored: Wed Aug 26 17:39:53 2015 +0200
Committer: Francesco Chicchiriccò <ilgro...@apache.org>
Committed: Wed Aug 26 17:39:53 2015 +0200

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

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