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

[Peter Lemenkov]

commit 5b6583beadfe4bc69e723113b751238f4ae3ae04
Merge: 8d2425d e159f0e
Author: Peter Lemenkov <lemenkov at gmail.com>
Date:   Mon Oct 31 20:57:56 2011 +0400

    Merge branch 'master' into el6

 .gitignore          |    1 +
 erlang-eradius.spec |    7 +++++--
 sources             |    2 +-
 3 files changed, 7 insertions(+), 3 deletions(-)
---