[erlang-oauth/el6: 5/5] Merge branch 'master' into el6

[Peter Lemenkov]

commit b5bf36ae4cd39a4d765fed2d550184867cb931d2
Merge: 1c3f3a0 4b4b297
Author: Peter Lemenkov <lemenkov at gmail.com>
Date:   Wed May 16 13:59:35 2012 +0400

    Merge branch 'master' into el6

 .gitignore                                         |    1 +
 ...1-Use-http-instead-of-httpc-in-old-Erlang.patch |   40 ------------------
 ...-0001-add-support-of-erlang-R15B-in-oauth.patch |   25 +++++++++++
 erlang-oauth.spec                                  |   43 ++++++++++++-------
 sources                                            |    2 +-
 5 files changed, 54 insertions(+), 57 deletions(-)
---