From 6cd5302e59b1a498c393c376c8e7501d3d1aa166 Mon Sep 17 00:00:00 2001
From: Rex Dieter <rdieter@gmail.com>
Date: Mar 01 2015 21:20:18 +0000
Subject: Merge branch 'master' into f22


---

diff --git a/.gitignore b/.gitignore
index 4e6c375..1383d45 100644
--- a/.gitignore
+++ b/.gitignore
@@ -12,3 +12,4 @@
 /amor-14.11.97.tar.xz
 /amor-14.12.1.tar.xz
 /amor-14.12.2.tar.xz
+/amor-14.12.3.tar.xz
diff --git a/amor.spec b/amor.spec
index 65a649c..a0afd0f 100644
--- a/amor.spec
+++ b/amor.spec
@@ -1,6 +1,6 @@
 Name:    amor
 Summary: Amusing misuse of resources
-Version: 14.12.2
+Version: 14.12.3
 Release: 1%{?dist}
 
 License: GPLv2+ and GFDL
@@ -69,6 +69,9 @@ fi
 
 
 %changelog
+* Sun Mar 01 2015 Rex Dieter <rdieter@fedoraproject.org> - 14.12.3-1
+- 14.12.3
+
 * Tue Feb 24 2015 Than Ngo <than@redhat.com> - 14.12.2-1
 - 14.12.2
 
diff --git a/sources b/sources
index 59370d2..af07521 100644
--- a/sources
+++ b/sources
@@ -1,2 +1 @@
-c8c01cd40fdaf81d97aa5aceb93b2f0f  amor-14.12.1.tar.xz
-9841b4e69ee4d79488ad113499d34e22  amor-14.12.2.tar.xz
+7ad09c409218f730f7373431af6a33d9  amor-14.12.3.tar.xz