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)
commitabfcd26e8ba897bd3aef2a05689ae51842e4ba55
treebe5a276c8d6c161be9ad1574ef23f2eb53a5920a
parenteb85ef9125c7d6c73b0f13153279e34d28edea56
parent21070097d76b6c4c158f7165b373e5ace618e0e7
Merge branch 'master' of ssh://git.planet-lab.org/git/lxc-reference

Conflicts:
initscript/lxc-reference
initscript/lxc-reference