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

[Vincent Batts]

commit acf8b1ac3b8b94d0d8b836b8ee0da928b1a83900
Merge: 06435b5 afcbe33
Author: Vincent Batts <vbatts at redhat.com>
Date:   Wed Nov 27 12:29:38 2013 -0500

    Merge branch 'master' into f20

 docker-io.spec |    8 +++++++-
 1 files changed, 7 insertions(+), 1 deletions(-)
---