From f6bbae46cc9bc5801c34dbff971036bdee008d21 Mon Sep 17 00:00:00 2001
From: Peter Robinson <pbrobinson@gmail.com>
Date: Aug 29 2014 18:06:26 +0000
Subject: fix merge


---

diff --git a/.gitignore b/.gitignore
index 7a69083..5b395e1 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1 @@
 /telepathy-mission-control-5.*.tar.gz
-telepathy-mission-control-5.11.0.tar.gz
diff --git a/sources b/sources
index 1e08b20..6d0e448 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-8dc751da77a84abef3f9153bc422a17b  telepathy-mission-control-5.16.2.tar.gz
+af583c41b97c649c37eebba1f2113427  telepathy-mission-control-5.16.3.tar.gz
diff --git a/telepathy-mission-control.spec b/telepathy-mission-control.spec
index 97ec9b0..0d8dc3c 100644
--- a/telepathy-mission-control.spec
+++ b/telepathy-mission-control.spec
@@ -1,7 +1,7 @@
 %define tp_glib_ver 0.17.5
 
 Name:           telepathy-mission-control
-Version:        5.16.2
+Version:        5.16.3
 Release:        1%{?dist}
 Epoch:          1
 Summary:        Central control for Telepathy connection manager
@@ -69,7 +69,7 @@ make install DESTDIR=%{buildroot}
 chrpath --delete %{buildroot}%{_libexecdir}/mission-control-5
 
 # Remove .la files
-find %{buildroot} -name '*.la' -exec rm -f {} ';'
+find %{buildroot} -name '*.la' -delete
 
 
 %check
@@ -107,9 +107,18 @@ fi
 
 
 %changelog
+* Fri Aug 29 2014 Peter Robinson <pbrobinson@fedoraproject.org> 1:5.16.3-1
+- Update to 5.16.3
+
+* Mon Aug 18 2014 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1:5.16.2-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild
+
 * Wed Jun 11 2014 Debarshi Ray <rishi@fedoraproject.org> - 1:5.16.2-1
 - Update to 5.16.2
 
+* Sun Jun 08 2014 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1:5.16.1-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild
+
 * Mon Jan 27 2014 Brian Pepple <bpepple@fedoraproject.org> - 1:5.16.1-1
 - Update to 5.16.1.