From dcebe39035193611a2e0a63ded927c5485d1a1f8 Mon Sep 17 00:00:00 2001
From: Rex Dieter <rdieter@math.unl.edu>
Date: Feb 03 2014 13:10:53 +0000
Subject: Merge branch 'master' into f20


---

diff --git a/.gitignore b/.gitignore
index 7c584aa..4c05b6b 100644
--- a/.gitignore
+++ b/.gitignore
@@ -2,3 +2,9 @@
 /amor-4.11.1.tar.xz
 /amor-4.11.2.tar.xz
 /amor-4.11.3.tar.xz
+/amor-4.11.90.tar.xz
+/amor-4.11.95.tar.xz
+/amor-4.11.97.tar.xz
+/amor-4.12.0.tar.xz
+/amor-4.12.1.tar.xz
+/amor-4.12.2.tar.xz
diff --git a/amor.spec b/amor.spec
index f64895e..fd783a1 100644
--- a/amor.spec
+++ b/amor.spec
@@ -1,6 +1,6 @@
 Name:    amor
 Summary: Amusing misuse of resources
-Version: 4.11.3
+Version: 4.12.2
 Release: 1%{?dist}
 
 License: GPLv2+ and GFDL
@@ -69,6 +69,24 @@ fi
 
 
 %changelog
+* Fri Jan 31 2014 Rex Dieter <rdieter@fedoraproject.org> - 4.12.2-1
+- 4.12.2
+
+* Fri Jan 10 2014 Rex Dieter <rdieter@fedoraproject.org> - 4.12.1-1
+- 4.12.1
+
+* Thu Dec 19 2013 Rex Dieter <rdieter@fedoraproject.org> - 4.12.0-1
+- 4.12.0
+
+* Sun Dec 01 2013 Rex Dieter <rdieter@fedoraproject.org> - 4.11.97-1
+- 4.11.97
+
+* Thu Nov 21 2013 Rex Dieter <rdieter@fedoraproject.org> - 4.11.95-1
+- 4.11.95
+
+* Sat Nov 16 2013 Rex Dieter <rdieter@fedoraproject.org> - 4.11.90-1
+- 4.11.90
+
 * Sat Nov 02 2013 Rex Dieter <rdieter@fedoraproject.org> - 4.11.3-1
 - 4.11.3
 
diff --git a/sources b/sources
index 503b386..e5f2088 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-7cb713131272a83b5e7c4941a7d82de8  amor-4.11.3.tar.xz
+4de55ed511ad0694857bd2736cf252dd  amor-4.12.2.tar.xz