[nspluginwrapper/f18: 8/8] merge with master

[Martin Stransky]

commit eccc078c9efc3768afff2b5ed92fc84cfa1a576f
Merge: 96f6d76 561f4fc
Author: Martin Stransky <stransky at anakreon.cz>
Date:   Wed May 29 09:30:26 2013 +0200

    merge with master

 .gitignore           |    1 +
 nspluginwrapper.spec |   10 +++++++++-
 2 files changed, 10 insertions(+), 1 deletions(-)
---