Merge branch '1_2_X'
Conflicts:
core/src/main/java/org/apache/syncope/core/quartz/AbstractTaskJob.java
core/src/main/resources/content.xml
core/src/test/resources/content.xml
Project: http://git-wip-us.apache.org/repos/asf/syncope/repo
Commit: http://git-wip-us.apache.org/repos/asf/syncope/commit/0ae4ac8e
Tree: http://git-wip-us.apache.org/repos/asf/syncope/tree/0ae4ac8e
Diff: http://git-wip-us.apache.org/repos/asf/syncope/diff/0ae4ac8e
Branch: refs/heads/master
Commit: 0ae4ac8e9875f881cf8ac5cde299273b09af1fa8
Parents: 0e90828 fed10a7
Author: giacomolm <[email protected]>
Authored: Mon Jun 22 14:04:10 2015 +0200
Committer: giacomolm <[email protected]>
Committed: Mon Jun 22 14:04:10 2015 +0200
----------------------------------------------------------------------
----------------------------------------------------------------------
