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

[Peter Lemenkov]

commit 3298d4a5a5b1cce26a66326a30f4432bf3cf2af3
Merge: 2b83f74 95ae871
Author: Peter Lemenkov <lemenkov at gmail.com>
Date:   Thu Oct 24 23:33:27 2013 +0400

    Merge branch 'master' into el6

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