From 7e10a00b9f1cf28695ae30abca8511ebd097ff42 Mon Sep 17 00:00:00 2001
From: Sam Hartman <hartmans@painless-security.com>
Date: Sat, 3 Nov 2012 05:53:39 -0400
Subject: [PATCH] Merge in upstream changes

---
 debian/changelog | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/debian/changelog b/debian/changelog
index ee519f1..728c597 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+shibboleth-resolver (0.3-2) unstable; urgency=low
+
+  * Merge in upstream changes
+
+ -- Sam Hartman <hartmans@debian.org>  Sat, 03 Nov 2012 05:53:26 -0400
+
 shibboleth-resolver (0.3-1) unstable; urgency=low
 
   * New upstream
-- 
2.1.4