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

[smizrahi]

commit e85fe66a0c2ff29e03150e43ae2430be4ee7652e
Merge: 0a34be1 755b0ce
Author: Saggi Mizrahi <ficoos at gmail.com>
Date:   Mon Oct 20 16:37:07 2014 +0300

    Merge branch 'f21' of ssh://pkgs.fedoraproject.org/ioprocess into f21
    
    Signed-off-by: Saggi Mizrahi <ficoos at gmail.com>
    
    Conflicts:
    	.gitignore
    	ioprocess.spec
    	sources

 ioprocess.spec |    4 ----
 1 files changed, 0 insertions(+), 4 deletions(-)
---
diff --cc ioprocess.spec
index 6833dba,2d9c966..2a72b58
--- a/ioprocess.spec
+++ b/ioprocess.spec
@@@ -58,17 -57,11 +58,13 @@@ Python bindings for ioproces
  %{python2_sitelib}/ioprocess/
  
  %changelog
 -* Wed Sep 3 2014 Saggi Mizrahi <smizrahi at redhat.com> 0.12.0-1
 -- Fixed memory leak due to forgetting to clear the pending requests queue in
 -  the python bindings
 -* Mon Aug 4 2014 Saggi Mizrahi <smizrahi at redhat.com> 0.10.0-1
 -- Fixed unsef strerror usage
 +* Mon Oct 20 2014 Saggi Mizrahi <smizrahi at redhat.com> 0.14.0-2
 +- Fix poll timeout
 +- Add support for zombiereaper where available
 +- Fix IOProcesses being referenced by commincation thread
 +- build: update INSTALL
 +- specfile: Add missing dependency to glib2
- * Wed Sep 3 2014 Saggi Mizrahi <smizrahi at redhat.com> 0.12.0-1
- - Fixed memory leak due to forgetting to clear the pending requests queue in
-   the python bindings
- * Mon Aug 4 2014 Saggi Mizrahi <smizrahi at redhat.com> 0.10.0-1
 +- Fixed unsefe strerror usage
  - Fixed cases logging lines get mangled
  * Tue Jul 29 2014 Saggi Mizrahi <smizrahi at redhat.com> 0.8.1-1
  - Fixed unsafe use of strerror