[nspluginwrapper: 2/2] merge

[Martin Stransky]

commit 67e527af70b009be7cb54e8e85d3120663816950
Merge: 328c8cd 74f98bd
Author: Martin Stransky <stransky at anakreon.cz>
Date:   Thu Jan 6 14:15:53 2011 +0100

    merge

 nspluginwrapper.spec |    5 ++++-
 1 files changed, 4 insertions(+), 1 deletions(-)
---
diff --cc nspluginwrapper.spec
index 6a59875,c1c8d5c..cc5d753
--- a/nspluginwrapper.spec
+++ b/nspluginwrapper.spec
@@@ -260,10 -258,9 +260,13 @@@ fi
  
  
  %changelog
 +* Thu Jan 6 2011 Martin Stransky <stransky at redhat.com> 1.3.0-15
 +- added patch from rhbz#544992 - embed standalone npplayer 
 +  in another program by Wade Brainerd.
 +
+ * Tue Nov 16 2010 Martin Stransky <stransky at redhat.com> 1.3.0-15
+ - added spice-xpi to ignored plugins
+ 
  * Wed Jun 30 2010 Martin Stransky <stransky at redhat.com> 1.3.0-14
  - fixed patch for rhbz#523273