packages: gajim/gajim.spec - fix merge from DEVEL

[cactus]

Author: cactus                       Date: Tue Mar 20 17:24:41 2012 GMT
Module: packages                      Tag: HEAD
---- Log message:
- fix merge from DEVEL

---- Files affected:
packages/gajim:
   gajim.spec (1.68 -> 1.69) 

---- Diffs:

================================================================
Index: packages/gajim/gajim.spec
diff -u packages/gajim/gajim.spec:1.68 packages/gajim/gajim.spec:1.69
--- packages/gajim/gajim.spec:1.68	Tue Mar 20 18:07:52 2012
+++ packages/gajim/gajim.spec	Tue Mar 20 18:24:36 2012
@@ -1,5 +1,4 @@
 # $Revision$, $Date$
-# $Revision$, $Date$
 Summary:	A Jabber client written in PyGTK
 Summary(pl.UTF-8):	Klient Jabbera napisany w PyGTK
 Name:		gajim
@@ -119,6 +118,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.69  2012/03/20 17:24:36  cactus
+- fix merge from DEVEL
+
 Revision 1.68  2012/03/20 17:07:52  megabajt
 - updated to 0.15; merged changes from DEVEL
 - removed -keyring-bug.patch (applied upstream)
================================================================

---- CVS-web:
    http://cvs.pld-linux.org//packages/gajim/gajim.spec?r1=1.68&r2=1.69&f=u