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

[Fabian Deutsch]

commit 95d9f47ed36e3899fdbd3b8a3db7ff6eaee4fb0c
Merge: deb7807 93aea17
Author: Fabian Deutsch <fabian.deutsch at gmx.de>
Date:   Fri Jan 20 11:17:38 2012 +0100

    Merge branch 'master' of ssh://pkgs.fedoraproject.org/presence
    
    Conflicts:
    	presence.spec
    
    Signed-off-by: Fabian Deutsch <fabian.deutsch at gmx.de>

 presence.spec |    7 +++++--
 1 files changed, 5 insertions(+), 2 deletions(-)
---
diff --cc presence.spec
index 596427d,702bb01..2ff36f1
--- a/presence.spec
+++ b/presence.spec
@@@ -1,6 -1,6 +1,6 @@@
  Name:           presence
  Version:        0.4.5
--Release:        2%{?dist}
++Release:        3%{?dist}
  Summary:        Bi-directional audio/video connections
  
  License:        GPLv2+
@@@ -52,9 -52,9 +52,12 @@@ desktop-file-validate %{buildroot}/%{_d
  
  
  %changelog
- * Fri Jan 20 2011 Fabian Deutsch <fabiand at fedoraproject.org> - 0.4.5-2
++* Fri Jan 20 2011 Fabian Deutsch <fabiand at fedoraproject.org> - 0.4.5-3
 +- Rebuild against new libmx
 +
+ * Sat Jan 14 2012 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.4.5-2
+ - Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild
+ 
  * Sat Dec 17 2011 Fabian Deutsch <fabiand at fedoraproject.org> - 0.4.5-1
  - Update to 0.4.5