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

[ilgrosso]

Merge branch '1_2_X'

Conflicts:
        deb/console/pom.xml
        deb/core/pom.xml


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

Branch: refs/heads/master
Commit: 16de3b8ef59f0e43dcfe5d35de86ca979ed505f6
Parents: f489d6e 35b974c
Author: Francesco Chicchiriccò <ilgro...@apache.org>
Authored: Fri Mar 27 11:16:42 2015 +0100
Committer: Francesco Chicchiriccò <ilgro...@apache.org>
Committed: Fri Mar 27 11:16:42 2015 +0100

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

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