[bmon/epel7: 3/3] Merge branch 'master' into epel7

[Thomas Graf]

commit f326de5514228caaccad3b814d93cad1ff5eadf4
Merge: 2379abe 18781e5
Author: Thomas Graf <tgraf at suug.ch>
Date:   Tue Nov 25 21:41:18 2014 +0100

    Merge branch 'master' into epel7

 bmon.spec |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)
---