[erlang-eradius/el6: 11/11] Merge branch 'master' into el6

[Peter Lemenkov]

commit 8d2425d95704a91e618cb82097a51462a62af42d
Merge: d681fb7 b515f77
Author: Peter Lemenkov <lemenkov at gmail.com>
Date:   Mon Oct 3 16:03:05 2011 +0400

    Merge branch 'master' into el6
    
    Conflicts:
    	.gitignore
    	erlang-eradius.spec

 .gitignore          |    5 +++
 erlang-eradius.spec |   81 +++++++++++++++++++++++++++++++--------------------
 sources             |    2 +-
 3 files changed, 55 insertions(+), 33 deletions(-)
---