[mozilla-noscript/el6: 20/20] Merge branch 'master' into el6

[Thomas Spura]

commit 2a59017558c0de84c5a718668d90c0388f94640d
Merge: 6d7d206 ad5002f
Author: Thomas Spura <thomas.spura at gmail.com>
Date:   Sat Oct 26 20:16:19 2013 +0200

    Merge branch 'master' into el6

 .gitignore                 |   13 +++++
 mozilla-noscript.spec      |  111 +++++++++++++++++++++++++++++++++++---------
 noscript-preferences.patch |   15 ++++--
 sources                    |    2 +-
 4 files changed, 114 insertions(+), 27 deletions(-)
---
diff --cc .gitignore
index b23a392,88074bc..34e7ce2
--- a/.gitignore
+++ b/.gitignore
@@@ -1,2 -1,16 +1,15 @@@
 -noscript-1.10.xpi
 -noscript-2.0.xpi
 +noscript-1.9.9.39.xpi
  /noscript-2.0.2.1.xpi
+ /noscript-2.0.3.4.xpi
+ /noscript-2.0.3.5.xpi
+ /noscript-2.0.5.1.xpi
+ /noscript-2.0.9.2.xpi
+ /noscript-2.0.9.9.xpi
+ /noscript-2.1.1.xpi
+ /noscript-2.1.4.xpi
+ /noscript-2.4.6.xpi
+ /noscript-2.6.4.1.xpi
+ /noscript-2.6.5.9.xpi
+ /noscript-2.6.6.9.xpi
+ /noscript-2.6.8.2.xpi
+ /noscript-2.6.8.4.xpi