git://git.onelab.eu / nodemanager.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 587e5a3 7ef1a21)
Merge commit 'origin/master'
authorroot <root@blitz.inria.fr>
Fri, 1 Apr 2011 20:58:20 +0000 (22:58 +0200)
committerroot <root@blitz.inria.fr>
Fri, 1 Apr 2011 20:58:20 +0000 (22:58 +0200)

Trivial merge
nodemanager