[iftop/el6: 2/2] Merge remote branch 'origin/master' into el6

[Robert Scheck]

commit 081248f76e2dc40e89e92ef97910bf6c90423963
Merge: de4c08a 1a6493a
Author: Robert Scheck <robert at fedoraproject.org>
Date:   Mon Jan 20 00:27:45 2014 +0100

    Merge remote branch 'origin/master' into el6

 .gitignore                     |    2 +-
 iftop-1.0-memory-leak.patch    |   30 ------------------------------
 iftop-1.0-ncursesw.patch       |   25 +++++++++++++++++++++++++
 iftop-1.0-nss-myhostname.patch |   32 --------------------------------
 iftop.spec                     |   18 +++++++++---------
 sources                        |    2 +-
 6 files changed, 36 insertions(+), 73 deletions(-)
---