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

[Pavel Alexeev]

commit aeeea06947b66a6fa5e34e6db667d06dfe6baad3
Merge: e8237db d2c7afc
Author: Pavel Alexeev (aka Pahan-Hubbitus) <pahan at hubbitus.info>
Date:   Tue Jan 7 19:03:39 2014 +0400

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

 iodine.spec |    3 +++
 1 files changed, 3 insertions(+), 0 deletions(-)
---
diff --cc iodine.spec
index a058b24,6e389ac..4871809
--- a/iodine.spec
+++ b/iodine.spec
@@@ -268,9 -266,9 +268,12 @@@ f
  %{_unitdir}/%{name}-server.service
  
  %changelog
 +* Tue Jan 7 2014 Pavel Alexeev <Pahan at Hubbitus.info> - 0.6.0-0.rc1.11
 +- Add Provides: bundled(md5-deutsch) to client and server sub-packages (#1046028)
 +
+ * Sat Aug 03 2013 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.6.0-0.rc1.10.1
+ - Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild
+ 
  * Sun Apr 14 2013 Pavel Alexeev <Pahan at Hubbitus.info> - 0.6.0-0.rc1.10
  - Add Requires: net-tools (bz#922225) for server package.