From 3178874221d2669f72d586b4eae393ea467492b2 Mon Sep 17 00:00:00 2001
From: Robert Scheck <robert@fedoraproject.org>
Date: Jan 12 2017 21:21:38 +0000
Subject: Merge remote branch 'origin/master' into el6


---

diff --git a/prosody.spec b/prosody.spec
index 2a8d67d..8361881 100644
--- a/prosody.spec
+++ b/prosody.spec
@@ -4,7 +4,7 @@
 
 Summary:           Flexible communications server for Jabber/XMPP
 Name:              prosody
-Version:           0.9.11
+Version:           0.9.12
 Release:           1%{?dist}
 License:           MIT
 Group:             System Environment/Daemons
@@ -222,6 +222,9 @@ fi
 %{_mandir}/man1/%{name}*.1*
 
 %changelog
+* Thu Jan 12 2017 Robert Scheck <robert@fedoraproject.org> 0.9.12-1
+- Upgrade to 0.9.12 (#1412102)
+
 * Mon Nov 07 2016 Robert Scheck <robert@fedoraproject.org> 0.9.11-1
 - Upgrade to 0.9.11 (#1391802)
 
diff --git a/sources b/sources
index 7ee6645..630b1e4 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-02d48f056ade5269bb5e3aff40b619c5  prosody-0.9.11.tar.gz
+SHA512 (prosody-0.9.12.tar.gz) = e87b5f3b3e327722cec9d8d0470684e2ec2788a1c5ae623c4f505a00572ef21f65afe84cd5b7de47d6a65fe8872506fe34e5e8886e20979ff84710669857ca76