git://git.onelab.eu / sliceimage.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 25de661 1431169)
Merge commit 'origin/master'
authorroot <root@cassidy.cs.princeton.edu>
Fri, 9 Jul 2010 09:50:04 +0000 (05:50 -0400)
committerroot <root@cassidy.cs.princeton.edu>
Fri, 9 Jul 2010 09:50:04 +0000 (05:50 -0400)

Trivial merge
sliceimage - was vserver-reference