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/69c0950a Tree: http://git-wip-us.apache.org/repos/asf/syncope/tree/69c0950a Diff: http://git-wip-us.apache.org/repos/asf/syncope/diff/69c0950a Branch: refs/heads/master Commit: 69c0950ac4f7b5b97596920311e9d0d247f95df6 Parents: 1fdefeb 8d141aa Author: giacomolm <[email protected]> Authored: Mon Jun 22 12:15:12 2015 +0200 Committer: giacomolm <[email protected]> Committed: Mon Jun 22 12:15:12 2015 +0200 ---------------------------------------------------------------------- pom.xml | 7 +- src/site/site.xml | 2 +- src/site/xdoc/mailing-lists.xml | 172 +++++++++++++++++++++++++++++++++++ 3 files changed, 176 insertions(+), 5 deletions(-) ----------------------------------------------------------------------
