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

[Eric Harney]

commit 4a44eca6d7233a12fff5b1afbd463644549a01fe
Merge: f4c4ed8 1600913
Author: Eric Harney <eharney at redhat.com>
Date:   Wed Oct 16 13:28:53 2013 -0400

    Merge branch 'master' into f20

 .gitignore            |    2 +-
 openstack-cinder.spec |   11 +++++++----
 sources               |    2 +-
 3 files changed, 9 insertions(+), 6 deletions(-)
---