git://git.onelab.eu / sfa.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 0732ed5 2fee1af)
Merge branch 'master' of ssh://git.f-lab.fr/git/sfa
authorNicolas Turro <nturro@sfa.grenoble.senslab.info>
Mon, 19 Sep 2011 14:29:40 +0000 (16:29 +0200)
committerNicolas Turro <nturro@sfa.grenoble.senslab.info>
Mon, 19 Sep 2011 14:29:40 +0000 (16:29 +0200)

Trivial merge
sfa