From 72fef2a2cc143f32327b1fc789bdc1432d0e8b43 Mon Sep 17 00:00:00 2001
From: NuwanSameera <nuwansameera74@gmail.com>
Date: Mon, 14 Dec 2015 18:35:09 +0530
Subject: [PATCH] Merge remote-tracking branch 'upstream/master'

Conflicts:
	modules/distribution/pom.xml
---
 modules/distribution/pom.xml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/modules/distribution/pom.xml b/modules/distribution/pom.xml
index 0c99c6f0..0ded64d2 100644
--- a/modules/distribution/pom.xml
+++ b/modules/distribution/pom.xml
@@ -447,6 +447,7 @@
                                 <!--<unzip src="target/shindig/WEB-INF/lib/shindig-common-${shindig.version}.jar" dest="${jardir}/shindig-common-${shindig.version}">
                                     <patternset>
                                         <exclude name="**/shindig.properties" />
+d                                        <exclude name="**/shindig.properties" />
                                     </patternset>
                                 </unzip>
                                 <copy file="src/repository/conf/shindig.properties" todir="${jardir}/shindig-common-${shindig.version}" />