[docker-io/f20: 3/3] Merge branch 'master' into f20

2013-12-02 Thread Lokesh Mandvekar
commit d23d04aa2711d0fc5f5289e707ab1f6099248c96 Merge: 50404bb 85e1946 Author: Lokesh Mandvekar Date: Mon Dec 2 09:50:12 2013 -0600 Merge branch 'master' into f20 80-docker.rules |4 ++-- docker-io.spec |6 +- docker.sysvinit |3 ++- 3 files changed, 9 insertions(+), 4 de

[docker-io/f20: 3/3] Merge branch 'master' into f20

2013-11-27 Thread Lokesh Mandvekar
commit 06435b5dd948ca5d4f019931eb7bef40f904e707 Merge: a38ea80 dc9edd7 Author: Lokesh Mandvekar Date: Wed Nov 27 08:38:48 2013 -0600 Merge branch 'master' into f20 .gitignore | 11 ++- docker-bridge_flag.patch | 16 docker-io.spec | 4