[openstack-cinder/f20: 2/2] Merge branch 'master' into f20

[Eric Harney]

commit f4c4ed88ed93955f263d3cd905cc4846f52d5fcc
Merge: e186a03 855869f
Author: Eric Harney <eharney at redhat.com>
Date:   Mon Oct 14 17:16:25 2013 -0400

    Merge branch 'master' into f20

 .gitignore                                         |    2 +-
 ...e-don-t-access-the-net-when-building-docs.patch |    2 +-
 ...ve-runtime-dep-on-python-pbr-python-d2to1.patch |    2 +-
 ...oslo.sphinx-and-remove-local-copy-of-doc-.patch |    2 +-
 openstack-cinder.spec                              |   11 +++++++----
 sources                                            |    2 +-
 6 files changed, 12 insertions(+), 9 deletions(-)
---