git://git.onelab.eu / nodemanager.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 4e914a6 6babe46)
Merge branch 'master' into lxc_devel
authorThierry Parmentelat <thierry.parmentelat@sophia.inria.fr>
Wed, 20 Jun 2012 06:34:12 +0000 (08:34 +0200)
committerThierry Parmentelat <thierry.parmentelat@sophia.inria.fr>
Wed, 20 Jun 2012 06:34:12 +0000 (08:34 +0200)

Trivial merge
nodemanager