git://git.onelab.eu / sfa.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: fb20a1f 17b9f07)
Merge branch 'master' of ssh://git.f-lab.fr/git/sfa
authorNicolas Turro <nturro@sfa2.grenoble.senslab.info>
Thu, 27 Oct 2011 15:04:43 +0000 (17:04 +0200)
committerNicolas Turro <nturro@sfa2.grenoble.senslab.info>
Thu, 27 Oct 2011 15:04:43 +0000 (17:04 +0200)

Trivial merge
sfa