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

[Lokesh Mandvekar]

commit 8f7798e7f904383ca7da3d8f5f849ee2b611d1c0
Merge: 0695de1 c03fcad
Author: Lokesh Mandvekar 
Date:   Thu Nov 28 03:02:36 2013 -0600

Merge branch 'master' into f20

docker-io.spec |    5 ++++-
 docker.service |    2 ++
 2 files changed, 6 insertions(+), 1 deletions(-)
---