git://git.onelab.eu / sfa.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: e2c2fc5 fb099e9)
Merge branch 'master' of ssh://git.onelab.eu/git/sfa
authorThierry Parmentelat <thierry.parmentelat@sophia.inria.fr>
Sat, 9 Apr 2011 11:50:09 +0000 (13:50 +0200)
committerThierry Parmentelat <thierry.parmentelat@sophia.inria.fr>
Sat, 9 Apr 2011 11:50:09 +0000 (13:50 +0200)

Trivial merge
sfa