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

[Peter Lemenkov]

commit a058bfef2241e3a08ed70ef2d33d811a2456055c
Merge: e0f30ed c5fe6de
Author: Peter Lemenkov <lemenkov at gmail.com>
Date:   Sat Apr 27 00:29:50 2013 +0400

    Merge branch 'master' into el6

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