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

[Peter Lemenkov]

commit b8e204171c94b5ad92bdcfa893b74d72ea243a36
Merge: 3db992a 95ae871
Author: Peter Lemenkov 
Date:   Thu Oct 24 23:36:16 2013 +0400

Merge branch 'master' into el5

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