git://git.onelab.eu / sfa.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: bcfe3fa 72be71c)
Merge branch 'master' of ssh://git.onelab.eu/git/sfa
authorThierry Parmentelat <thierry.parmentelat@sophia.inria.fr>
Thu, 21 Jun 2012 12:32:14 +0000 (14:32 +0200)
committerThierry Parmentelat <thierry.parmentelat@sophia.inria.fr>
Thu, 21 Jun 2012 12:32:14 +0000 (14:32 +0200)

Trivial merge
sfa