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

[Tomasz Torcz]

commit 82e175544fce5cd75d5005c24e50217a8f8e1958
Merge: fe067b8 f41854e
Author: Tomasz Torcz <tomek at pipebreaker.pl>
Date:   Tue Jul 22 11:45:20 2014 +0200

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

 owfs.spec |    8 +++++++-
 1 files changed, 7 insertions(+), 1 deletions(-)
---
diff --cc owfs.spec
index 3dad9c4,d1a3ce4..9a94ab1
--- a/owfs.spec
+++ b/owfs.spec
@@@ -393,12 -395,12 +393,18 @@@ exit 
  
  
  %changelog
 +* Mon Jul 21 2014 Tomasz Torcz <ttorcz at fedoraproject.org> - 2.9p5.20140721git6d00fb1-1
 +- package snapshot
 +- use upstream systemd units
 +- enable owserver's socket activation
 +- fixed hardcoded tcl_sitearch, patch by Jaroslav Škarvada <jskarvad at redhat.com>
 +
+ * Sat Jun 07 2014 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 2.9p5-3
+ - Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild
+ 
+ * Wed May 21 2014 Jaroslav Škarvada <jskarvad at redhat.com> - 2.9p5-2
+ - Rebuilt for https://fedoraproject.org/wiki/Changes/f21tcl86
+ 
  * Thu May 15 2014 Tomasz Torcz <ttorcz at fedoraproject.org> - 2.9p5-1
  - latest upstream release