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

[Peter Lemenkov]

commit 4de642e476e878cab0c26f629ee3588964a0c0f4
Merge: 9b7f672 c5fe6de
Author: Peter Lemenkov <lemenkov at gmail.com>
Date:   Sat Apr 27 00:30:27 2013 +0400

    Merge branch 'master' into el5

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