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

[Peter Lemenkov]

commit 9b7f672f8e3c277b7b885ec94a7270eef1af0541
Merge: f824316 3f29666
Author: Peter Lemenkov <lemenkov at gmail.com>
Date:   Fri Dec 21 16:16:06 2012 +0400

    Merge branch 'master' into el5

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