git://git.onelab.eu / nodemanager.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: cdc2396 bf8e9a6)
Merge commit 'origin/master'
authorroot <root@blitz.inria.fr>
Tue, 5 Apr 2011 23:52:33 +0000 (01:52 +0200)
committerroot <root@blitz.inria.fr>
Tue, 5 Apr 2011 23:52:33 +0000 (01:52 +0200)

Trivial merge
nodemanager