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

[Peter Lemenkov]

commit c9a936327f800c79f9ac208bd380b6b055bc8629
Merge: a18664e 6dd9397
Author: Peter Lemenkov <lemenkov at gmail.com>
Date:   Fri May 17 18:39:41 2013 +0400

    Merge branch 'master' into el6

 .gitignore            |    1 +
 erlang-erlsyslog.spec |   11 +++++++----
 sources               |    2 +-
 3 files changed, 9 insertions(+), 5 deletions(-)
---