[tigase-xmltools/el5/master: 6/6] Merge branch 'master' into el5

[Matej Cepl]

commit f134261bfe961894357bb6fd31ca106d8c0e1f23
Merge: 8fb26db 912c610
Author: Matěj Cepl <mcepl at redhat.com>
Date:   Tue Oct 19 14:24:42 2010 +0200

    Merge branch 'master' into el5
    
    Conflicts:
    	.gitignore
    	sources
    	tigase-xmltools.spec

 .gitignore           |    2 +-
 sources              |    4 ++++
 tigase-xmltools.spec |   15 +++++++++------
 3 files changed, 14 insertions(+), 7 deletions(-)
---
diff --cc .gitignore
index 0726143,f2cd8af..bfa78c1
--- a/.gitignore
+++ b/.gitignore
@@@ -1,1 -1,3 +1,1 @@@
--tigase-xmltools-3.3.4.tar.bz2
 -/tigase-xmltools.tar.bz2
+ /tigase-xmltools-3.3.5.tar.bz2
diff --cc sources
index 4ca6536,208b760..7be6375
--- a/sources
+++ b/sources
@@@ -1,1 -1,1 +1,5 @@@
++<<<<<<< HEAD
 +74ab6e2467e0377880beac8ab02591b2  tigase-xmltools-3.3.4.tar.bz2
++=======
+ ecfd59f564472e96f6cc3ae900456edf  tigase-xmltools-3.3.5.tar.bz2
++>>>>>>> master
diff --cc tigase-xmltools.spec
index 99d9eb1,eff0a30..8931319
--- a/tigase-xmltools.spec
+++ b/tigase-xmltools.spec
@@@ -72,9 -74,9 +72,12 @@@ rm -rf $RPM_BUILD_ROO
  %{_javadocdir}/%{name}
  
  %changelog
+ * Tue Oct 19 2010 Matěj Cepl <mcepl at redhat.com> - 3.3.5-1
+ - New upstream release.
+ 
 +* Sat Aug 28 2010 Matěj Cepl <mcepl at redhat.com> - 3.3.4-4
 +- Add unversioned symlink to the versioned jar file.
 +
  * Tue May 11 2010 Matěj Cepl <mcepl at redhat.com> - 3.3.4-3
  - Fixing description per reviewer's request