git://git.onelab.eu / nodeupdate.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: d427d25 6bea657)
Merge commit 'origin/master' into 0.5 0.5
authorroot <root@cassidy.cs.princeton.edu>
Fri, 23 Jul 2010 11:00:42 +0000 (07:00 -0400)
committerroot <root@cassidy.cs.princeton.edu>
Fri, 23 Jul 2010 11:00:42 +0000 (07:00 -0400)

Trivial merge
nodeupdate