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

[Lokesh Mandvekar]

commit 50404bbbe8841934a8795b8ff3e0601020f6a730
Merge: 0148e79 8e81a15
Author: Lokesh Mandvekar <lsm5 at redhat.com>
Date:   Mon Dec 2 08:00:47 2013 -0600

    Merge branch 'master' into f20

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