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

[Fabian Affolter]

commit ca0a59b2b19c2fda8714fb4e5bc5dfceb2a637ee
Merge: b099dea c67a75a
Author: Fabian Affolter <mail at fabian-affolter.ch>
Date:   Tue Jun 26 19:56:27 2012 +0200

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

 tinc.spec |    4 ++++
 1 files changed, 4 insertions(+), 0 deletions(-)
---
diff --cc tinc.spec
index cb7184d,597623d..527c1f3
--- a/tinc.spec
+++ b/tinc.spec
@@@ -64,12 -64,9 +64,16 @@@ f
  
  
  %changelog
++<<<<<<< HEAD
 +* Tue Jun 26 2012 Fabian Affolter <mail at fabian-affolter.ch> - 1.0.19-1
 +- Updated to new upstream version 1.0.16
 +
 +* Sat Mar 31 2012 Fabian Affolter <mail at fabian-affolter.ch> - 1.0.18-1
 +- Updated to new upstream version 1.0.18
 +
+ * Sat Jan 14 2012 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.0.16-2
+ - Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild
+ 
  * Fri Sep 16 2011 Fabian Affolter <mail at fabian-affolter.ch> - 1.0.16-1
  - Updated to new upstream version 1.0.16