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

[Peter Lemenkov]

commit 3db992af0eb9e6e43f183f2cd220fd9d1bfc3119
Merge: ab659ba 223c4e1
Author: Peter Lemenkov <lemenkov at gmail.com>
Date:   Thu Oct 24 23:11:50 2013 +0400

    Merge branch 'master' into el5

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