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

[Eric Harney]

commit da77617458e2a4c8d0fce11b8d9e985f8afec3e2
Merge: 4a44eca 9867fd4
Author: Eric Harney <eharney at redhat.com>
Date:   Thu Oct 17 13:06:27 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                              |   18 +++++++++++-------
 sources                                            |    2 +-
 6 files changed, 16 insertions(+), 12 deletions(-)
---