[docker-io/el6: 4/4] Merge branch 'master' into el6

commit d2b4ea650a55e27f5b6bc503db3b1da28a5818d3 Merge: 40122bf 85e1946 Author: Lokesh Mandvekar Date: Mon Dec 2 10:20:03 2013 -0600 Merge branch 'master' into el6 80-docker.rules |4 ++-- docker-io.spec |9 - docker.service |1 - docker.sysvinit |3 ++- 4 files c

[docker-io/el6: 4/4] Merge branch 'master' into el6

commit 40122bf9354f5446768c74b689b224c63f379f28 Merge: c275b77 909a890 Author: Lokesh Mandvekar Date: Sun Dec 1 20:55:30 2013 -0600 Merge branch 'master' into el6 docker-io.spec | 25 ++--- docker.service |3 ++- docker.sysconfig |2 +- docker.sysvinit |

[docker-io/el6: 4/4] Merge branch 'master' into el6

commit 5a35ce777f7707b4e3a6235509047dcefab17169 Merge: a815094 c03fcad Author: Lokesh Mandvekar Date: Thu Nov 28 03:32:15 2013 -0600 Merge branch 'master' into el6 Signed-off-by: Lokesh Mandvekar Conflicts: docker-io.spec docker-0.7.0-iptables-fix.patch | 89 +