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

Fri Oct 18 11:46:31 UTC 2013

commit 0fb8845095c0dfcfe4121d4c826ef7c9c5cac0fd
Merge: 27bcb2d 953496b
Author: Pádraig Brady <P at draigBrady.com>
Date:   Fri Oct 18 12:46:15 2013 +0100

    Merge branch 'master' into f20

 .gitignore           |    1 +
 openstack-swift.spec |   16 ++++++++++++----
 sources              |    2 +-
 3 files changed, 14 insertions(+), 5 deletions(-)
---