[erlang-erlsyslog/el6: 3/3] Merge branch 'master' into el6

[Peter Lemenkov]

commit e0f30edae2e01d126da739d99c7a4b0951ed324c
Merge: 977840c 3f29666
Author: Peter Lemenkov <lemenkov at gmail.com>
Date:   Fri Dec 21 16:15:35 2012 +0400

    Merge branch 'master' into el6

 .gitignore            |    1 +
 erlang-erlsyslog.spec |   25 ++++++++++++++-----------
 sources               |    2 +-
 3 files changed, 16 insertions(+), 12 deletions(-)
---