[glances/f18: 6/6] Merge branch 'master' into f18

[madko]

commit b5baa84e18d1f70f7db1bf0d2139e9152d17d6ae
Merge: ab88437 801a748
Author: Edouard Bourguignon <madko at linuxed.net>
Date:   Sun Aug 11 15:08:15 2013 +0200

    Merge branch 'master' into f18

 .gitignore   |   16 ++--------------
 glances.spec |   37 ++++++++++++++++++++++++++-----------
 sources      |    2 +-
 3 files changed, 29 insertions(+), 26 deletions(-)
---