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

[Peter Lemenkov]

commit 668e191dfa79b7fc0d9f118cba9af87acc948f0a
Merge: 4de642e 5f7f94d
Author: Peter Lemenkov <lemenkov at gmail.com>
Date:   Thu May 16 17:59:10 2013 +0400

    Merge branch 'master' into el5

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