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

author Pierre Veyre <pierre.veyre@cc.in2p3.fr>

Tue, 24 Sep 2013 08:45:30 +0000 (10:45 +0200)

committer Pierre Veyre <pierre.veyre@cc.in2p3.fr>

Tue, 24 Sep 2013 08:45:30 +0000 (10:45 +0200)
author Pierre Veyre <pierre.veyre@cc.in2p3.fr>
Tue, 24 Sep 2013 08:45:30 +0000 (10:45 +0200)
committer Pierre Veyre <pierre.veyre@cc.in2p3.fr>
Tue, 24 Sep 2013 08:45:30 +0000 (10:45 +0200)
diff --cc src/include/surf/surf.h
Simple merge
diff --cc src/msg/msg_io.c
Simple merge
diff --cc src/surf/storage.c
Simple merge
author	Pierre Veyre <pierre.veyre@cc.in2p3.fr>
	Tue, 24 Sep 2013 08:45:30 +0000 (10:45 +0200)
committer	Pierre Veyre <pierre.veyre@cc.in2p3.fr>
	Tue, 24 Sep 2013 08:45:30 +0000 (10:45 +0200)
		1	2
src/include/surf/surf.h	patch \|	diff1 \|	diff2 \|	blob \| history
src/msg/msg_io.c	patch \|	diff1 \|	diff2 \|	blob \| history
src/surf/storage.c	patch \|	diff1 \|	diff2 \|	blob \| history