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

[Peter Lemenkov]

commit 2b83f740eefdee70aebd48b38780a4a11092fb9a
Merge: c9a9363 223c4e1
Author: Peter Lemenkov <lemenkov at gmail.com>
Date:   Thu Oct 24 23:10:55 2013 +0400

    Merge branch 'master' into el6

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