Resolved merge "merge changes. Strange, it seems to ate pierre commit" and

[simgrid.git] / AUTHORS

The main contributors of SimGrid are:

Martin Quinson (Martin.Quinson::loria.fr)
Arnaud Legrand (Arnaud.Legrand::imag.fr)

Please refer to the people.html web page (also included in this
archive) for more information.