Merge branch 'master' of ssh://git.planet-lab.org/git/lxc-reference
authorMarco Yuen <marcoy@cs.princeton.edu>
Thu, 22 Dec 2011 16:46:45 +0000 (11:46 -0500)
committerMarco Yuen <marcoy@cs.princeton.edu>
Thu, 22 Dec 2011 16:46:45 +0000 (11:46 -0500)
Conflicts:
initscript/lxc-reference


No differences found