git://git.onelab.eu / sfa.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: c7fb5a2 98a3d5a)
Merge branch 'master' into senslab2
authorNicolas Turro <Nicolas.Turro@inria.fr>
Fri, 18 Nov 2011 16:38:34 +0000 (17:38 +0100)
committerNicolas Turro <Nicolas.Turro@inria.fr>
Fri, 18 Nov 2011 16:38:34 +0000 (17:38 +0100)
Conflicts:
sfa/util/xml.py


Trivial merge
sfa