[Pkg-mozext-commits] [compactheader] 207/441: Merge with branch B_1_2

[David Prévot]

This is an automated email from the git hooks/post-receive script.

taffit pushed a commit to branch master
in repository compactheader.

commit 4778a08b2b7d1a4f47e574844e1ab4b7ae7ce304
Merge: c51468f f89802e
Author: joachim <none at none>
Date:   Sun Jun 5 18:54:45 2011 +0200

    Merge with branch B_1_2

 install.rdf | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --cc install.rdf
index 5f89d94,1d15f95..ba5feeb
--- a/install.rdf
+++ b/install.rdf
@@@ -6,7 -6,7 +6,7 @@@
  
  	<RDF:Description about="urn:mozilla:install-manifest">
  		<em:name>CompactHeader</em:name>
- 		<em:version>1.4.0beta1</em:version>
 -		<em:version>1.2.5beta1</em:version>
++		<em:version>1.4.0beta2</em:version>
  		<em:description>Add ability to reduce header size to one or two lines. Linkify subjects in RSS feeds.</em:description>
  		<em:creator>Joachim Herb</em:creator>
  		<em:contributor>Zamula</em:contributor>

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-mozext/compactheader.git