[wt: 2/2] Merge branch 'master' of ssh://pkgs.fedoraproject.org/wt

[Michal Minar]

commit 01d19081a407ea584397021dd2afd06928ea2811
Merge: 11ac1b7 5e2e8a3
Author: Michal Minar <miminar at redhat.com>
Date:   Wed Dec 26 12:37:13 2012 +0100

    Merge branch 'master' of ssh://pkgs.fedoraproject.org/wt
    
    Conflicts:
    	wt.spec

 wt.spec |    3 +++
 1 files changed, 3 insertions(+), 0 deletions(-)
---
diff --cc wt.spec
index 0d121ac,ddae3d5..b9ca54b
--- a/wt.spec
+++ b/wt.spec
@@@ -238,9 -243,9 +238,12 @@@ pop
  %{_defaultdocdir}/%{name}-doc-%{version}/examples/*
  
  %changelog
 +* Wed Dec 26 2012 Michal Minar <miminar at redhat.com> - 3.2.3-1
 +- Version 3.2.3
 +
+ * Mon Dec 24 2012 Rex Dieter <rdieter at fedoraproject.org> 3.2.2-7.p1
+ - rebuild (GraphicsMagick)
+ 
  * Thu Sep 13 2012 Michal Minar <miminar at redhat.com> - 3.2.2-6.p1
  - fixed changelog line