[nethogs/el6: 8/8] Merge branch 'master' into el6

[Anderson de Farias Silva]

commit dd901f5daecce5ea5d191c36f12965dcfc44c5e7
Merge: 686b7ae 60d887e
Author: Anderson Silva <ansilva at redhat.com>
Date:   Tue Mar 3 12:58:30 2015 -0500

    Merge branch 'master' into el6

 nethogs.spec | 23 ++++++++++++++++++++++-
 1 file changed, 22 insertions(+), 1 deletion(-)
---