Merge branch '1_2_X' of https://git-wip-us.apache.org/repos/asf/syncope into 1_2_X
Project: http://git-wip-us.apache.org/repos/asf/syncope/repo Commit: http://git-wip-us.apache.org/repos/asf/syncope/commit/3600ee9f Tree: http://git-wip-us.apache.org/repos/asf/syncope/tree/3600ee9f Diff: http://git-wip-us.apache.org/repos/asf/syncope/diff/3600ee9f Branch: refs/heads/1_2_X Commit: 3600ee9fde36523ea24a7f2a34fe9d8a801d6e89 Parents: 38cbc33 4894fe4 Author: Marco Di Sabatino Di Diodoro <mdisabat...@apache.org> Authored: Fri Dec 4 15:54:30 2015 +0100 Committer: Marco Di Sabatino Di Diodoro <mdisabat...@apache.org> Committed: Fri Dec 4 15:54:30 2015 +0100 ---------------------------------------------------------------------- pom.xml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) ----------------------------------------------------------------------