[python-oauthlib/el6: 2/2] Merge branch 'master' into el6

[Ralph Bean]

commit 4894d65efda24aab2d8efa990fb7847fa0216fc5
Merge: c332b54 703d555
Author: Ralph Bean <rbean at redhat.com>
Date:   Thu Apr 17 13:03:15 2014 -0400

    Merge branch 'master' into el6

 python-oauthlib.spec |   19 ++++++++++++++++---
 1 files changed, 16 insertions(+), 3 deletions(-)
---