git://git.onelab.eu / sfa.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 4c152a5 9a472c8)
Merge branch 'geni-v3' of ssh://git.onelab.eu/git/sfa into geni-v3
authorMohamed Larabi <mohamed.larabi@inria.fr>
Mon, 13 Jan 2014 16:24:38 +0000 (17:24 +0100)
committerMohamed Larabi <mohamed.larabi@inria.fr>
Mon, 13 Jan 2014 16:24:38 +0000 (17:24 +0100)

Trivial merge
sfa