commit 3b0845142cc4edd5c0e09c167d001ba572139e7f
Merge: bf0e23c e3ff9ac
Author: Lokesh Mandvekar <lsm5(a)redhat.com>
Date: Sat Nov 23 12:12:39 2013 -0600
Merge branch 'master' into f20
.gitignore | 1 +
docker-io.spec | 41 ++++++++++++------
docker.sysconfig | 1 +
docker.sysvinit | 121 ++++++++++++++++++++++++++++++++++++++++++++++++++++++
docker.xinetd | 11 -----
sources | 2 +-
6 files changed, 151 insertions(+), 26 deletions(-)
---
Show replies by date