git://git.onelab.eu / nodeupdate.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: a5255e6 a3ad727)
Merge commit 'local_master/planetlab-3_3-bootcd-branch' into planetlab-3_2-branch planetlab-3_2-branch
authorroot <root@cassidy.cs.princeton.edu>
Sun, 24 Oct 2010 20:12:42 +0000 (16:12 -0400)
committerroot <root@cassidy.cs.princeton.edu>
Sun, 24 Oct 2010 20:12:42 +0000 (16:12 -0400)

Trivial merge
nodeupdate