[xfce4-hamster-plugin/f22: 2/2] Merge branch 'master' into f22

[Raphael Groner]

commit bf9e1094dcd5b6fc4689d3c9276d29347c6351ba
Merge: 6ba15fb c4dc638
Author: Raphael Groner <projects.rg at smart.ms>
Date:   Fri Mar 6 21:56:16 2015 +0100

    Merge branch 'master' into f22

 .gitignore                |  2 ++
 sources                   |  2 ++
 xfce4-hamster-plugin.spec | 35 +++++++++++++++++++----------------
 3 files changed, 23 insertions(+), 16 deletions(-)
---