[slic3r/f21: 11/11] Merge branch 'master' into f21

[Miro Hrončok]

commit 38821dc2adf7e2af5b1fd6c882fc058de8968bdc
Merge: beeedd8 7d8e177
Author: Miro Hrončok <miro at hroncok.cz>
Date:   Tue Sep 23 16:27:36 2014 +0200

    Merge branch 'master' into f21
    
    Conflicts:
    	slic3r.spec

 .gitignore                      |    2 +
 slic3r-clear-error.patch        |   36 ++++++++++
 slic3r-test-out-of-memory.patch |  138 +++++++++++++++++++++++++++++++++++++++
 slic3r.spec                     |   34 ++++++++--
 sources                         |    2 +-
 5 files changed, 204 insertions(+), 8 deletions(-)
---
diff --cc slic3r.spec
index 2c1eba2,7b71201..e09bd57
--- a/slic3r.spec
+++ b/slic3r.spec
@@@ -184,9 -188,22 +188,25 @@@ f
  %{_datadir}/%{name}
  
  %changelog
+ * Tue Sep 23 2014 Miro Hrončok <mhroncok at redhat.com> - 1.1.7-1
+ - Update to 1.1.7
+ - Add patch from Debian to fix debian#757798
+ 
+ * Tue Sep 23 2014 Miro Hrončok <mhroncok at redhat.com> - 1.1.6-4
+ - Admesh 0.98.1 compatibility patch
+ 
+ * Fri Aug 29 2014 Jitka Plesnikova <jplesnik at redhat.com> - 1.1.6-3
+ - Perl 5.20 rebuild
+ 
+ * Mon Aug 18 2014 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.1.6-2
+ - Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild
+ 
+ * Tue Jul 29 2014 Miro Hrončok <mhroncok at redhat.com> - 1.1.6-1
+ - Update to 1.1.6
+ 
 +* Mon Aug 18 2014 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.1.5-2
 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild
 +
  * Sun Jun 29 2014 Miro Hrončok <mhroncok at redhat.com> - 1.1.5-1
  - Update to 1.1.5
  - Unbundle stuff