Origine: file:///home/svn/repository/spip-zone/_plugins_/yaml
<<<<<<< HEAD
Revision: 74084
Dernier commit: 2013-07-05 13:00:07 +0200
file:///home/svn/repository/spip-zone/_plugins_/yaml
74084
2013-07-05 13:00:07 +0200
=======
Revision: 78336
Dernier commit: 2013-11-11 00:00:50 +0100
file:///home/svn/repository/spip-zone/_plugins_/yaml
78336
2013-11-11 00:00:50 +0100
>>>>>>> v1