git://git.onelab.eu / sfa.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: a77dff2 e75f7bb)
Merge commit 'origin/master'
authorroot <root@blitz.inria.fr>
Fri, 25 Mar 2011 20:13:41 +0000 (21:13 +0100)
committerroot <root@blitz.inria.fr>
Fri, 25 Mar 2011 20:13:41 +0000 (21:13 +0100)

Trivial merge
sfa