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

[Pádraig Brady]

commit d4ab497293b2c097c4243649233328e9a091e9a6
Merge: 324ff07 6ab1e6e
Author: Pádraig Brady <P at draigBrady.com>
Date:   Fri Oct 18 14:10:42 2013 +0100

    Merge branch 'master' into f20

 .gitignore                                         |    1 +
 ...-Don-t-access-the-net-while-building-docs.patch |    2 +-
 0002-Remove-runtime-dep-on-python-pbr.patch        |    2 +-
 ...-oslo.sphinx-and-remove-local-copy-of-doc.patch |    2 +-
 openstack-glance.spec                              |   14 ++++++++------
 sources                                            |    2 +-
 6 files changed, 13 insertions(+), 10 deletions(-)
---