From: Samuel Lepetit <samuel.lepetit@inria.fr>
Date: Wed, 9 May 2012 15:30:29 +0000 (+0200)
Subject: Merge branch 'master' of git+ssh://scm.gforge.inria.fr//gitroot/simgrid/simgrid
X-Git-Tag: v3_7~26
X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/commitdiff_plain/0c14e681436e252f680310c7696b3ba17a349706?hp=3f8469006c8a8486904d2870733afabfb0d968a7

Merge branch 'master' of git+ssh://scm.gforge.inria.fr//gitroot/simgrid/simgrid
---

diff --git a/src/msg/msg_task.c b/src/msg/msg_task.c
index 93fa4b1823..a833cf50f9 100644
--- a/src/msg/msg_task.c
+++ b/src/msg/msg_task.c
@@ -196,7 +196,7 @@ const char *MSG_task_get_name(m_task_t task)
 }
 
 /** \ingroup m_task_management
- * \brief Return the name of a #m_task_t.
+ * \brief Sets the name of a #m_task_t.
  *
  * This functions allows to associate a name to a task
  */