[Pkg-mozext-commits] [SCM] Packaging for https-everywhere branch, master, updated. upstream/1.0.0-22-gf813cea

[Rogério Brito]

The following commit has been merged in the master branch:
commit 68799bfdae4b121e14b1ddc85e25541ef1000fb0
Merge: 1a951f81c292c57e27214c513d4219244e1371cf 2004ddae3ce8813b13bfcac2ad7145115798d215
Author: Rogério Brito <rbrito at ime.usp.br>
Date:   Wed Aug 17 21:56:59 2011 -0300

    Merge commit 'upstream/1.0.1'
    
    Conflicts:
    	Changelog
    	chrome/content/about.xul
    	chrome/content/rules/default.rulesets
    	install.rdf
    
    Fix the results manually.


-- 
Packaging for https-everywhere