Merge branch '0.9.0' of github.com:arantius/greasemonkey into 0.9.0

Conflicts: .gitignore components/greasemonkey.js content/browser.js content/xmlhttprequester.js
scriptish · May 8, 2010 · c3af5a4 · c3af5a4
2 parents e3e09d8 + b944e63
commit c3af5a4
Showing 1 changed file with 1 addition and 1 deletion.
diff --git a/.gitignore b/.gitignore
@@ -1,3 +1,3 @@
 *.xpi
 .project
-.settings
+.settings