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

[Peter Lemenkov]

commit a0cb7879b278fa4691c1ec46713c287e1b55ee78
Merge: a058bfe 5f7f94d
Author: Peter Lemenkov <lemenkov at gmail.com>
Date:   Thu May 16 17:58:20 2013 +0400

    Merge branch 'master' into el6

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