[wt/f19: 6/6] Merge branch 'f18' into f19

[Michal Minar]

commit 66fcefbf48ca437487d029ea3d42e28c9450471b
Merge: 6642f26 712c99c
Author: Michal Minar <miminar at redhat.com>
Date:   Fri Jun 21 12:47:08 2013 +0200

    Merge branch 'f18' into f19
    
    Conflicts:
    	wt.spec

 .gitignore                                         |    1 +
 sources                                            |    2 +-
 ...PACKAGE-LICENSING => wt-3.3.0-PACKAGE-LICENSING |    0
 wt.spec                                            |   13 ++++++++++---
 4 files changed, 12 insertions(+), 4 deletions(-)
---
diff --cc wt.spec
index 1a7b917,12d4f39..cc08644
--- a/wt.spec
+++ b/wt.spec
@@@ -5,8 -5,8 +5,13 @@@
  %global WTRUNGROUP      apache
  
  Name:           wt
++<<<<<<< HEAD
 +Version:        3.2.3
 +Release:        2%{?dist}
++=======
+ Version:        3.3.0
+ Release:        1%{?dist}
++>>>>>>> f18
  Summary:        C++ library for developing web applications
  
  Group:          Development/Libraries
@@@ -238,9 -237,9 +242,12 @@@ pop
  %{_defaultdocdir}/%{name}-doc-%{version}/examples/*
  
  %changelog
+ * Thu Jun 20 2013 Michal Minar <miminar at redhat.com> 3.3.0-1
+ - Version 3.3.0
+ 
 +* Sat Feb 09 2013 Denis Arnaud <denis.arnaud_fedora at m4x.org> - 3.2.3-2
 +- Rebuild for Boost-1.53.0
 +
  * Wed Dec 26 2012 Michal Minar <miminar at redhat.com> - 3.2.3-1
  - Version 3.2.3