[firehol/el6: 4/4] Merge branch 'master' into el6

[Susi Lehtola]

commit ee105a6c4dbee7de0b13a39626beb0d7813dbecb
Merge: 07000d3 a3e5c81
Author: Susi Lehtola <jussilehtola at fedoraproject.org>
Date:   Thu Nov 28 12:55:07 2013 +0200

    Merge branch 'master' into el6

 .gitignore                  |    1 +
 firehol-1.273-getiana.patch |  278 -------------------------------------------
 firehol.spec                |   17 ++-
 sources                     |    2 +-
 4 files changed, 12 insertions(+), 286 deletions(-)
---