[hylafax+/el6: 3/3] Merge remote branch 'origin/master' into el6

[Robert Scheck]

commit 618f9295f985c188da50a41805378ffb0501e0d3
Merge: 4f46117 306bb1d
Author: Robert Scheck <robert at fedoraproject.org>
Date:   Sat Apr 13 16:14:20 2013 +0200

    Merge remote branch 'origin/master' into el6

 .gitignore           |    2 +-
 hylafax+.spec        |   24 +++++++++++++++---------
 hylafax+_daily.cron  |    8 ++++++--
 hylafax+_hourly.cron |    4 +++-
 hylafax+_rh.init     |    7 +++++--
 hylafax+_sysconfig   |    5 +++++
 hylafax-5.5.3.tar.gz |  Bin 1342657 -> 0 bytes
 sources              |    2 +-
 8 files changed, 36 insertions(+), 16 deletions(-)
---