git://git.onelab.eu / sfa.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 198ca5e cf9a9bf)
Merge branch 'master' of ssh://git.onelab.eu/git/sfa
authorSandrine Avakian <sandrine.avakian@inria.fr>
Wed, 25 Sep 2013 08:50:48 +0000 (10:50 +0200)
committerSandrine Avakian <sandrine.avakian@inria.fr>
Wed, 25 Sep 2013 08:50:48 +0000 (10:50 +0200)

Trivial merge
sfa