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

[Lokesh Mandvekar]

commit ef0458a3d4b3eed4efef40fc433fc731df55d5bb
Merge: 962f852 e4542db
Author: Lokesh Mandvekar <lsm5(a)redhat.com&gt;
Date:   Thu Nov 28 00:42:04 2013 -0600

    Merge branch 'master' into f20

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