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

[Pádraig Brady]

commit 8348dc0ee79ea97e5bafe76629f2ff25fe27a31f
Merge: 6b2b04b 24287a8
Author: Pádraig Brady <P at draigBrady.com>
Date:   Wed Oct 16 01:24:05 2013 +0100

    Merge branch 'master' into f20

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