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

[Vincent Batts]

commit a38ea803b7f25582a80af884dc103157b39dcd0f
Merge: 3b08451 cc30592
Author: Vincent Batts <vbatts at redhat.com>
Date:   Mon Nov 25 08:15:24 2013 -0500

    Merge branch 'master' into f20

 docker-io.spec |   12 +++++++++---
 1 files changed, 9 insertions(+), 3 deletions(-)
---