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

[Peter Lemenkov]

commit ab659bae25d4ed8b27ed620e465eea2f29b01e1d
Merge: b37308c 6dd9397
Author: Peter Lemenkov <lemenkov at gmail.com>
Date:   Fri May 17 18:40:48 2013 +0400

    Merge branch 'master' into el5

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