[ioprocess/f20: 3/3] Merge branch 'f20' of ssh://pkgs.fedoraproject.org/ioprocess into f20

[smizrahi]

commit a4e7da43ef7826b6bdfa99ea43bbeb30695da8f5
Merge: 383dacf 5671b0f
Author: Saggi Mizrahi <ficoos at gmail.com>
Date:   Thu Jun 5 15:18:21 2014 +0300

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

 .gitignore     |    6 ++++++
 ioprocess.spec |    2 +-
 2 files changed, 7 insertions(+), 1 deletions(-)
---
diff --cc .gitignore
index 41d6a7a,0f3a516..d802d22
--- a/.gitignore
+++ b/.gitignore
@@@ -1,2 -1,6 +1,8 @@@
  /ioprocess-0.3.tar.gz
 +/ioprocess-0.4.1.tar.gz
+ /ioprocess-0.3-1.fc20.src.rpm
+ /ioprocess-0.4-1.fc20.src.rpm
+ /ioprocess.spec
+ /ioprocess-0.4-2.fc20.src.rpm
+ /ioprocess-0.4.tar.gz
++>>>>>>> 5671b0f60e120fb2c25d0a9e90aa7a9413625368
diff --cc ioprocess.spec
index 2cedb2c,36f23cb..64e2e77
--- a/ioprocess.spec
+++ b/ioprocess.spec
@@@ -57,9 -56,7 +57,9 @@@ Python bindings for ioproces
  %{python2_sitelib}/ioprocess/
  
  %changelog
 +* Thu Jun 05 2014 Saggi Mizrahi <smizrahi at redhat.com> 0.4.1-1
 +Fixed missing dependcy for python bindings
- * Mon Jun 02 2014 Saggi Mizrahi <smizrahi at redhat.com> 0.4-1
+ * Mon Jun 02 2014 Saggi Mizrahi <smizrahi at redhat.com> 0.4-2
  Added touch command
  Changed truncate to include setting file mode and creating a file only when one
  doesn't exist