From 720e673cfc318ab99f7e3381a70aad53859c6d4e Mon Sep 17 00:00:00 2001
From: Jan Grulich <jgrulich@redhat.com>
Date: Dec 18 2012 10:00:03 +0000
Subject: Merge branch master into f18


---

diff --git a/ktp-auth-handler.spec b/ktp-auth-handler.spec
index a726be9..b7c001c 100644
--- a/ktp-auth-handler.spec
+++ b/ktp-auth-handler.spec
@@ -42,13 +42,20 @@ make install/fast DESTDIR=%{buildroot} -C %{_target_platform}
 %doc COPYING 
 %{_kde4_libexecdir}/ktp-auth-handler
 %{_datadir}/dbus-1/services/org.freedesktop.Telepathy.Client.KTp.SASLHandler.service
+%{_datadir}/dbus-1/services/org.freedesktop.Telepathy.Client.KTp.ConfAuthObserver.service
 %{_datadir}/telepathy/clients//KTp.SASLHandler.client
-
+%{_datadir}/telepathy/clients//KTp.ConfAuthObserver.client
 
 %changelog
-* Mon Dec 17 2012 Jan Grulich <jgrulich@redhat.com> - 0.5.2-1
+* Mon Dec 17 2012 Jan Grulich <jgrulich@redhat.com> 0.5.2-1
 - 0.5.2
 
+* Thu Nov 27 2012 Jan Grulich <jgrulich@redhat.com> 0.5.1-3
+- Rebuild (qjson)
+
+* Fri Nov 23 2012 Jan Grulich <jgrulich@redhat.com> 0.5.1-2
+- Rebuild for qjson 0.8.0
+
 * Fri Oct 05 2012 Rex Dieter <rdieter@fedoraproject.org> - 0.5.1-1
 - 0.5.1