Merge branch 'master' of scm.gforge.inria.fr:/gitroot/simgrid/simgrid

diff --combined doc/doxygen/inside_release.doc
index e66ac5f,e0831f7..95cfe0d
--- 1/doc/doxygen/inside_release.doc
--- 2/doc/doxygen/inside_release.doc
+++ b/doc/doxygen/inside_release.doc
@@@ -98,7 -98,7 +98,7 @@@ the settings icon of the release you wa
   - Mail the simgrid-user mailing list
      - the NEWS chunk in the mail;
      - Hall of Fame in the mail\n
-       git log --after="22 september 2017" --pretty=short |grep Author|sort |uniq -c 
+       git shortlog -sne v3.18..
      - the ChangeLog chunk as attachment
   - Also mail some other lists (G5K users), with only the NEWS chunk
     and the link to the download section
@@@ -110,7 -110,7 +110,7 @@@
    - edit debian/control
      - s/simgrid3.XX/simgrid3.XY/ 
      - libsimgrid3.XY conflicts with libsimgrid3.XX because of smpimain
 -- Update the simgrid/package.py for spack: https://github.com/solverstack/spack
 +- Update the simgrid/package.py for spack: https://gitlab.inria.fr/solverstack/spack-repo
  - Create the template for the next release in ChangeLog and NEWS files
  - Change the release number in CMakeLists.txt