Merge branch 'master' into el6

2013-12-19 20:29:11 +01:00 · 2013-12-19 20:29:11 +01:00 · e9be4e21ba
commit e9be4e21ba
parent edbfe62402 1bc793d481
3 changed files with 6 additions and 2 deletions
--- a/.gitignore
+++ b/.gitignore
@ -22,3 +22,4 @@ etckeeper_0.41.tar.gz
 /etckeeper_1.7.tar.gz
 /etckeeper_1.9.tar.gz
 /etckeeper_1.10.tar.gz
+/etckeeper_1.11.tar.gz
--- a/etckeeper.spec
+++ b/etckeeper.spec
@ -2,7 +2,7 @@
 %{!?_pkgdocdir: %global _pkgdocdir %{_docdir}/%{name}-%{version}}

 Name:      etckeeper
-Version:   1.10
+Version:   1.11
 Release:   1%{?dist}
 Summary:   Store /etc in a SCM system (git, mercurial, bzr or darcs)
 Group:     Applications/System
@ -95,6 +95,9 @@ fi
 %endif

 %changelog
+* Thu Dec 19 2013 Thomas Moschny <thomas.moschny@gmx.de> - 1.11-1
+- Update to 1.11.
+
 * Sat Nov  9 2013 Thomas Moschny <thomas.moschny@gmx.de> - 1.10-1
 - Update to 1.10.

--- a/2
+++ b/2
@ -1 +1 @@
-8f9376166d97aa3c842223db93ee2889  etckeeper_1.10.tar.gz
+fd6b8f62593a9ab7664828bad93e7fb2  etckeeper_1.11.tar.gz