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

[smizrahi]

commit ac1daf6e85dfd3f4028c979d0559f168f6842a15
Merge: 275bfb3 4b8f48c
Author: Saggi Mizrahi <ficoos at gmail.com>
Date:   Mon Oct 20 17:00:27 2014 +0300

    Merge branch 'master' of ssh://pkgs.fedoraproject.org/ioprocess
    
    Conflicts:
    	.gitignore
    	ioprocess.spec
    	sources

 .gitignore     |    1 +
 ioprocess.spec |    5 +++++
 2 files changed, 6 insertions(+), 0 deletions(-)
---
diff --cc .gitignore
index 3b6c39e,e60c129..d81162e
--- a/.gitignore
+++ b/.gitignore
@@@ -1,4 -1,4 +1,5 @@@
  /ioprocess-0.3.tar.gz
  /ioprocess-0.6.1.tar.gz
  /ioprocess-0.10.0.tar.gz
 +/ioprocess-0.14.0.tar.gz
+ /ioprocess-0.12.0.tar.gz
diff --cc ioprocess.spec
index 6833dba,2d9c966..9a6461d
--- a/ioprocess.spec
+++ b/ioprocess.spec
@@@ -6,8 -6,8 +6,13 @@@
  %endif
  
  Name:		ioprocess
++<<<<<<< HEAD
 +Version:	0.14.0
 +Release:	1%{?dist}
++=======
+ Version:	0.12.0
+ Release:	2%{?dist}
++>>>>>>> 4b8f48ce5eb2e9459f076bb22b79d958882c2773
  Summary:	Slave process to perform risky IO
  
  Group:		System Environment/Base