[Fixed previous broken build
Adrian Georgescu <ag@ag-projects.com>**20160213105058
 Ignore-this: dde8214202ae66241db21d40ac573c09
] hunk ./ChatController.py 247
-        self.require_encryption = self.sessionController.contact.contact.require_encryption if self.sessionController.contact is not None and isinstance(self.sessionController.contact, BlinkPresenceContact) else True
conflictor {{
:
hunk ./Info-sip2sip.plist 24
-	<string>3.4.0</string>
+	<string>3.5.0</string>
hunk ./Info-sip2sip.plist 24
-	<string>3.4.0</string>
+	<string>4.0.0</string>
hunk ./Info-sip2sip.plist 24
-	<string>4.0.0</string>
+	<string>4.0.1</string>
:
hunk ./Info-sip2sip.plist 24
-	<string>4.0.1</string>
+	<string>4.0.2</string>
hunk ./Info-sip2sip.plist 24
-	<string>3.4.0</string>
+	<string>4.0.0</string>
:
hunk ./Info-sip2sip.plist 24
-	<string>4.0.0</string>
+	<string>4.0.1</string>
:
hunk ./Info-sip2sip.plist 24
-	<string>3.4.0</string>
+	<string>4.0.0</string>
}} []
hunk ./Info-sip2sip.plist 24
-	<string>3.4.0</string>
+	<string>4.0.0</string>
hunk ./Info-sip2sip.plist 24
-	<string>4.0.0</string>
+	<string>4.0.1</string>
hunk ./Info-sip2sip.plist 24
-	<string>4.0.1</string>
+	<string>4.0.2</string>
:
hunk ./Info-sip2sip.plist 24
-	<string>4.0.2</string>
+	<string>4.0.3</string>
conflictor {{
:
hunk ./Info-sip2sip.plist 47
-	<string>3.4.0</string>
+	<string>3.5.0</string>
hunk ./Info-sip2sip.plist 47
-	<string>3.4.0</string>
+	<string>4.0.0</string>
hunk ./Info-sip2sip.plist 47
-	<string>4.0.0</string>
+	<string>4.0.1</string>
:
hunk ./Info-sip2sip.plist 47
-	<string>4.0.1</string>
+	<string>4.0.2</string>
hunk ./Info-sip2sip.plist 47
-	<string>3.4.0</string>
+	<string>4.0.0</string>
:
hunk ./Info-sip2sip.plist 47
-	<string>4.0.0</string>
+	<string>4.0.1</string>
:
hunk ./Info-sip2sip.plist 47
-	<string>3.4.0</string>
+	<string>4.0.0</string>
}} []
hunk ./Info-sip2sip.plist 47
-	<string>3.4.0</string>
+	<string>4.0.0</string>
hunk ./Info-sip2sip.plist 47
-	<string>4.0.0</string>
+	<string>4.0.1</string>
hunk ./Info-sip2sip.plist 47
-	<string>4.0.1</string>
+	<string>4.0.2</string>
:
hunk ./Info-sip2sip.plist 47
-	<string>4.0.2</string>
+	<string>4.0.3</string>
hunk ./Info.plist 24
-	<string>5.8.2</string>
+	<string>5.8.3</string>
hunk ./Info.plist 47
-	<string>5.8.2</string>
+	<string>5.8.3</string>
hunk ./ReleaseNotes/BlinkAppcast.xml 9
-            <title>Version 5.8.2</title>
+            <title>Version 5.8.3</title>
hunk ./ReleaseNotes/BlinkAppcast.xml 16
-                       sparkle:version="5.8.2"
+                       sparkle:version="5.8.3"
conflictor {{
:
hunk ./ReleaseNotes/SIP2SIPAppcast.xml 9
+            <title>Version 3.5.0</title>
+            <sparkle:minimumSystemVersion>10.9.0</sparkle:minimumSystemVersion>
+		<sparkle:releaseNotesLink>
+			https://blink.sipthor.net/ReleaseNotes/changelog-sip2sip.html
+		</sparkle:releaseNotesLink>
+            <pubDate>Thu Dec 10 16:26:06 ART 2015</pubDate>
+            <enclosure url="https://blink.sipthor.net/download-sip2sip.phtml?os=mac"
+                       sparkle:version="3.5.0" 
+                       type="application/octet-stream" 
+                       />
+         </item>
+         <item>
hunk ./ReleaseNotes/SIP2SIPAppcast.xml 9
+            <title>Version 4.0.0</title>
+            <sparkle:minimumSystemVersion>10.9.0</sparkle:minimumSystemVersion>
+		<sparkle:releaseNotesLink>
+			https://blink.sipthor.net/ReleaseNotes/changelog-sip2sip.html
+		</sparkle:releaseNotesLink>
+            <pubDate>Mon Feb  8 22:24:13 CET 2016</pubDate>
+            <enclosure url="https://blink.sipthor.net/download-sip2sip.phtml?os=mac"
+                       sparkle:version="4.0.0" 
+                       type="application/octet-stream" 
+                       />
+         </item>
+         <item>
hunk ./ReleaseNotes/SIP2SIPAppcast.xml 9
+            <title>Version 4.0.1</title>
+            <sparkle:minimumSystemVersion>10.9.0</sparkle:minimumSystemVersion>
+		<sparkle:releaseNotesLink>
+			https://blink.sipthor.net/ReleaseNotes/changelog-sip2sip.html
+		</sparkle:releaseNotesLink>
+            <pubDate>Fri Feb 12 10:24:24 CET 2016</pubDate>
+            <enclosure url="https://blink.sipthor.net/download-sip2sip.phtml?os=mac"
+                       sparkle:version="4.0.1" 
+                       type="application/octet-stream" 
+                       />
+         </item>
+         <item>
:
hunk ./ReleaseNotes/SIP2SIPAppcast.xml 9
+            <title>Version 4.0.2</title>
+            <sparkle:minimumSystemVersion>10.9.0</sparkle:minimumSystemVersion>
+		<sparkle:releaseNotesLink>
+			https://blink.sipthor.net/ReleaseNotes/changelog-sip2sip.html
+		</sparkle:releaseNotesLink>
+            <pubDate>Sat Feb 13 11:40:38 CET 2016</pubDate>
+            <enclosure url="https://blink.sipthor.net/download-sip2sip.phtml?os=mac"
+                       sparkle:version="4.0.2" 
+                       type="application/octet-stream" 
+                       />
+         </item>
+         <item>
hunk ./ReleaseNotes/SIP2SIPAppcast.xml 9
+            <title>Version 4.0.0</title>
+            <sparkle:minimumSystemVersion>10.9.0</sparkle:minimumSystemVersion>
+		<sparkle:releaseNotesLink>
+			https://blink.sipthor.net/ReleaseNotes/changelog-sip2sip.html
+		</sparkle:releaseNotesLink>
+            <pubDate>Mon Feb  8 22:24:13 CET 2016</pubDate>
+            <enclosure url="https://blink.sipthor.net/download-sip2sip.phtml?os=mac"
+                       sparkle:version="4.0.0" 
+                       type="application/octet-stream" 
+                       />
+         </item>
+         <item>
:
hunk ./ReleaseNotes/SIP2SIPAppcast.xml 9
+            <title>Version 4.0.1</title>
+            <sparkle:minimumSystemVersion>10.9.0</sparkle:minimumSystemVersion>
+		<sparkle:releaseNotesLink>
+			https://blink.sipthor.net/ReleaseNotes/changelog-sip2sip.html
+		</sparkle:releaseNotesLink>
+            <pubDate>Fri Feb 12 10:24:24 CET 2016</pubDate>
+            <enclosure url="https://blink.sipthor.net/download-sip2sip.phtml?os=mac"
+                       sparkle:version="4.0.1" 
+                       type="application/octet-stream" 
+                       />
+         </item>
+         <item>
:
hunk ./ReleaseNotes/SIP2SIPAppcast.xml 9
+            <title>Version 4.0.0</title>
+            <sparkle:minimumSystemVersion>10.9.0</sparkle:minimumSystemVersion>
+		<sparkle:releaseNotesLink>
+			https://blink.sipthor.net/ReleaseNotes/changelog-sip2sip.html
+		</sparkle:releaseNotesLink>
+            <pubDate>Mon Feb  8 22:24:13 CET 2016</pubDate>
+            <enclosure url="https://blink.sipthor.net/download-sip2sip.phtml?os=mac"
+                       sparkle:version="4.0.0" 
+                       type="application/octet-stream" 
+                       />
+         </item>
+         <item>
}} []
hunk ./ReleaseNotes/SIP2SIPAppcast.xml 9
+            <title>Version 4.0.0</title>
+            <sparkle:minimumSystemVersion>10.9.0</sparkle:minimumSystemVersion>
+		<sparkle:releaseNotesLink>
+			https://blink.sipthor.net/ReleaseNotes/changelog-sip2sip.html
+		</sparkle:releaseNotesLink>
+            <pubDate>Mon Feb  8 22:24:13 CET 2016</pubDate>
+            <enclosure url="https://blink.sipthor.net/download-sip2sip.phtml?os=mac"
+                       sparkle:version="4.0.0" 
+                       type="application/octet-stream" 
+                       />
+         </item>
+         <item>
hunk ./ReleaseNotes/SIP2SIPAppcast.xml 9
+            <title>Version 4.0.1</title>
+            <sparkle:minimumSystemVersion>10.9.0</sparkle:minimumSystemVersion>
+		<sparkle:releaseNotesLink>
+			https://blink.sipthor.net/ReleaseNotes/changelog-sip2sip.html
+		</sparkle:releaseNotesLink>
+            <pubDate>Fri Feb 12 10:24:24 CET 2016</pubDate>
+            <enclosure url="https://blink.sipthor.net/download-sip2sip.phtml?os=mac"
+                       sparkle:version="4.0.1" 
+                       type="application/octet-stream" 
+                       />
+         </item>
+         <item>
hunk ./ReleaseNotes/SIP2SIPAppcast.xml 9
+            <title>Version 4.0.2</title>
+            <sparkle:minimumSystemVersion>10.9.0</sparkle:minimumSystemVersion>
+		<sparkle:releaseNotesLink>
+			https://blink.sipthor.net/ReleaseNotes/changelog-sip2sip.html
+		</sparkle:releaseNotesLink>
+            <pubDate>Sat Feb 13 11:40:38 CET 2016</pubDate>
+            <enclosure url="https://blink.sipthor.net/download-sip2sip.phtml?os=mac"
+                       sparkle:version="4.0.2" 
+                       type="application/octet-stream" 
+                       />
+         </item>
+         <item>
:
hunk ./ReleaseNotes/SIP2SIPAppcast.xml 9
-            <title>Version 4.0.2</title>
+            <title>Version 4.0.3</title>
conflictor {{
:
hunk ./ReleaseNotes/SIP2SIPAppcast.xml 9
+            <title>Version 3.5.0</title>
+            <sparkle:minimumSystemVersion>10.9.0</sparkle:minimumSystemVersion>
+		<sparkle:releaseNotesLink>
+			https://blink.sipthor.net/ReleaseNotes/changelog-sip2sip.html
+		</sparkle:releaseNotesLink>
+            <pubDate>Thu Dec 10 16:26:06 ART 2015</pubDate>
+            <enclosure url="https://blink.sipthor.net/download-sip2sip.phtml?os=mac"
+                       sparkle:version="3.5.0" 
+                       type="application/octet-stream" 
+                       />
+         </item>
+         <item>
hunk ./ReleaseNotes/SIP2SIPAppcast.xml 9
+            <title>Version 4.0.0</title>
+            <sparkle:minimumSystemVersion>10.9.0</sparkle:minimumSystemVersion>
+		<sparkle:releaseNotesLink>
+			https://blink.sipthor.net/ReleaseNotes/changelog-sip2sip.html
+		</sparkle:releaseNotesLink>
+            <pubDate>Mon Feb  8 22:24:13 CET 2016</pubDate>
+            <enclosure url="https://blink.sipthor.net/download-sip2sip.phtml?os=mac"
+                       sparkle:version="4.0.0" 
+                       type="application/octet-stream" 
+                       />
+         </item>
+         <item>
hunk ./ReleaseNotes/SIP2SIPAppcast.xml 9
+            <title>Version 4.0.1</title>
+            <sparkle:minimumSystemVersion>10.9.0</sparkle:minimumSystemVersion>
+		<sparkle:releaseNotesLink>
+			https://blink.sipthor.net/ReleaseNotes/changelog-sip2sip.html
+		</sparkle:releaseNotesLink>
+            <pubDate>Fri Feb 12 10:24:24 CET 2016</pubDate>
+            <enclosure url="https://blink.sipthor.net/download-sip2sip.phtml?os=mac"
+                       sparkle:version="4.0.1" 
+                       type="application/octet-stream" 
+                       />
+         </item>
+         <item>
hunk ./ReleaseNotes/SIP2SIPAppcast.xml 9
+            <title>Version 4.0.2</title>
+            <sparkle:minimumSystemVersion>10.9.0</sparkle:minimumSystemVersion>
+		<sparkle:releaseNotesLink>
+			https://blink.sipthor.net/ReleaseNotes/changelog-sip2sip.html
+		</sparkle:releaseNotesLink>
+            <pubDate>Sat Feb 13 11:40:38 CET 2016</pubDate>
+            <enclosure url="https://blink.sipthor.net/download-sip2sip.phtml?os=mac"
+                       sparkle:version="4.0.2" 
+                       type="application/octet-stream" 
+                       />
+         </item>
+         <item>
:
hunk ./ReleaseNotes/SIP2SIPAppcast.xml 9
-            <title>Version 4.0.2</title>
+            <title>Version 4.0.3</title>
hunk ./ReleaseNotes/SIP2SIPAppcast.xml 9
+            <title>Version 4.0.0</title>
+            <sparkle:minimumSystemVersion>10.9.0</sparkle:minimumSystemVersion>
+		<sparkle:releaseNotesLink>
+			https://blink.sipthor.net/ReleaseNotes/changelog-sip2sip.html
+		</sparkle:releaseNotesLink>
+            <pubDate>Mon Feb  8 22:24:13 CET 2016</pubDate>
+            <enclosure url="https://blink.sipthor.net/download-sip2sip.phtml?os=mac"
+                       sparkle:version="4.0.0" 
+                       type="application/octet-stream" 
+                       />
+         </item>
+         <item>
hunk ./ReleaseNotes/SIP2SIPAppcast.xml 9
+            <title>Version 4.0.1</title>
+            <sparkle:minimumSystemVersion>10.9.0</sparkle:minimumSystemVersion>
+		<sparkle:releaseNotesLink>
+			https://blink.sipthor.net/ReleaseNotes/changelog-sip2sip.html
+		</sparkle:releaseNotesLink>
+            <pubDate>Fri Feb 12 10:24:24 CET 2016</pubDate>
+            <enclosure url="https://blink.sipthor.net/download-sip2sip.phtml?os=mac"
+                       sparkle:version="4.0.1" 
+                       type="application/octet-stream" 
+                       />
+         </item>
+         <item>
:
hunk ./ReleaseNotes/SIP2SIPAppcast.xml 9
+            <title>Version 4.0.2</title>
+            <sparkle:minimumSystemVersion>10.9.0</sparkle:minimumSystemVersion>
+		<sparkle:releaseNotesLink>
+			https://blink.sipthor.net/ReleaseNotes/changelog-sip2sip.html
+		</sparkle:releaseNotesLink>
+            <pubDate>Sat Feb 13 11:40:38 CET 2016</pubDate>
+            <enclosure url="https://blink.sipthor.net/download-sip2sip.phtml?os=mac"
+                       sparkle:version="4.0.2" 
+                       type="application/octet-stream" 
+                       />
+         </item>
+         <item>
hunk ./ReleaseNotes/SIP2SIPAppcast.xml 9
+            <title>Version 4.0.0</title>
+            <sparkle:minimumSystemVersion>10.9.0</sparkle:minimumSystemVersion>
+		<sparkle:releaseNotesLink>
+			https://blink.sipthor.net/ReleaseNotes/changelog-sip2sip.html
+		</sparkle:releaseNotesLink>
+            <pubDate>Mon Feb  8 22:24:13 CET 2016</pubDate>
+            <enclosure url="https://blink.sipthor.net/download-sip2sip.phtml?os=mac"
+                       sparkle:version="4.0.0" 
+                       type="application/octet-stream" 
+                       />
+         </item>
+         <item>
:
hunk ./ReleaseNotes/SIP2SIPAppcast.xml 9
+            <title>Version 4.0.1</title>
+            <sparkle:minimumSystemVersion>10.9.0</sparkle:minimumSystemVersion>
+		<sparkle:releaseNotesLink>
+			https://blink.sipthor.net/ReleaseNotes/changelog-sip2sip.html
+		</sparkle:releaseNotesLink>
+            <pubDate>Fri Feb 12 10:24:24 CET 2016</pubDate>
+            <enclosure url="https://blink.sipthor.net/download-sip2sip.phtml?os=mac"
+                       sparkle:version="4.0.1" 
+                       type="application/octet-stream" 
+                       />
+         </item>
+         <item>
:
hunk ./ReleaseNotes/SIP2SIPAppcast.xml 9
+            <title>Version 4.0.0</title>
+            <sparkle:minimumSystemVersion>10.9.0</sparkle:minimumSystemVersion>
+		<sparkle:releaseNotesLink>
+			https://blink.sipthor.net/ReleaseNotes/changelog-sip2sip.html
+		</sparkle:releaseNotesLink>
+            <pubDate>Mon Feb  8 22:24:13 CET 2016</pubDate>
+            <enclosure url="https://blink.sipthor.net/download-sip2sip.phtml?os=mac"
+                       sparkle:version="4.0.0" 
+                       type="application/octet-stream" 
+                       />
+         </item>
+         <item>
}} []
hunk ./ReleaseNotes/SIP2SIPAppcast.xml 9
+            <title>Version 4.0.0</title>
+            <sparkle:minimumSystemVersion>10.9.0</sparkle:minimumSystemVersion>
+		<sparkle:releaseNotesLink>
+			https://blink.sipthor.net/ReleaseNotes/changelog-sip2sip.html
+		</sparkle:releaseNotesLink>
+            <pubDate>Mon Feb  8 22:24:13 CET 2016</pubDate>
+            <enclosure url="https://blink.sipthor.net/download-sip2sip.phtml?os=mac"
+                       sparkle:version="4.0.0" 
+                       type="application/octet-stream" 
+                       />
+         </item>
+         <item>
hunk ./ReleaseNotes/SIP2SIPAppcast.xml 9
+            <title>Version 4.0.1</title>
+            <sparkle:minimumSystemVersion>10.9.0</sparkle:minimumSystemVersion>
+		<sparkle:releaseNotesLink>
+			https://blink.sipthor.net/ReleaseNotes/changelog-sip2sip.html
+		</sparkle:releaseNotesLink>
+            <pubDate>Fri Feb 12 10:24:24 CET 2016</pubDate>
+            <enclosure url="https://blink.sipthor.net/download-sip2sip.phtml?os=mac"
+                       sparkle:version="4.0.1" 
+                       type="application/octet-stream" 
+                       />
+         </item>
+         <item>
hunk ./ReleaseNotes/SIP2SIPAppcast.xml 9
+            <title>Version 4.0.2</title>
+            <sparkle:minimumSystemVersion>10.9.0</sparkle:minimumSystemVersion>
+		<sparkle:releaseNotesLink>
+			https://blink.sipthor.net/ReleaseNotes/changelog-sip2sip.html
+		</sparkle:releaseNotesLink>
+            <pubDate>Sat Feb 13 11:40:38 CET 2016</pubDate>
+            <enclosure url="https://blink.sipthor.net/download-sip2sip.phtml?os=mac"
+                       sparkle:version="4.0.2" 
+                       type="application/octet-stream" 
+                       />
+         </item>
+         <item>
:
hunk ./ReleaseNotes/SIP2SIPAppcast.xml 16
-                       sparkle:version="4.0.2" 
+                       sparkle:version="4.0.3" 
hunk ./ReleaseNotes/changelog-beta.html 9
-<h2>Version 5.8.2</h2>
+<h2>Version 5.8.3</h2>
conflictor {{
:
hunk ./ReleaseNotes/changelog-sip2sip.html 9
+<h2>Version 3.5.0</h2>
+
+<p>December 10th, 2015
+
+<ul>
+<li>Fixed critical bugs on OSX 10.11.2
+<li>Update to latest SIP Simple Client SDK 2.6.0
+<li>Fixed polution with presence related notifications
+</ul>
+
+
hunk ./ReleaseNotes/changelog-sip2sip.html 9
+<h2>Version 4.0.0</h2>
+
+<p>February 8th, 2016
+
+<ul>
+<li>Added support for OTR version 3
+<li>Fixed some critical bugs on OSX 10.11.2
+<li>Update to latest SIP Simple Client SDK 2.6.0
+<li>Fixed polution with presence related notifications
+<li>Fixed broken SIP registrations when network conditions changed
+</ul>
+
+
hunk ./ReleaseNotes/changelog-sip2sip.html 9
+<h2>Version 4.0.1</h2>
+
+<p>February 12th, 2016
+
+<ul>
+<li>OTR encryption fixes
+</ul>
+
+
:
hunk ./ReleaseNotes/changelog-sip2sip.html 9
+<h2>Version 4.0.2</h2>
+
+<p>February 13th, 2016
+
+<ul>
+<li>More OTR encryption fixes
+<li>Fixed call transfer
+</ul>
+
+
hunk ./ReleaseNotes/changelog-sip2sip.html 9
+<h2>Version 4.0.0</h2>
+
+<p>February 8th, 2016
+
+<ul>
+<li>Added support for OTR version 3
+<li>Fixed some critical bugs on OSX 10.11.2
+<li>Update to latest SIP Simple Client SDK 2.6.0
+<li>Fixed polution with presence related notifications
+<li>Fixed broken SIP registrations when network conditions changed
+</ul>
+
+
:
hunk ./ReleaseNotes/changelog-sip2sip.html 9
+<h2>Version 4.0.1</h2>
+
+<p>February 12th, 2016
+
+<ul>
+<li>OTR encryption fixes
+</ul>
+
+
:
hunk ./ReleaseNotes/changelog-sip2sip.html 9
+<h2>Version 4.0.0</h2>
+
+<p>February 8th, 2016
+
+<ul>
+<li>Added support for OTR version 3
+<li>Fixed some critical bugs on OSX 10.11.2
+<li>Update to latest SIP Simple Client SDK 2.6.0
+<li>Fixed polution with presence related notifications
+<li>Fixed broken SIP registrations when network conditions changed
+</ul>
+
+
}} []
hunk ./ReleaseNotes/changelog-sip2sip.html 9
+<h2>Version 4.0.0</h2>
+
+<p>February 8th, 2016
+
+<ul>
+<li>Added support for OTR version 3
+<li>Fixed some critical bugs on OSX 10.11.2
+<li>Update to latest SIP Simple Client SDK 2.6.0
+<li>Fixed polution with presence related notifications
+<li>Fixed broken SIP registrations when network conditions changed
+</ul>
+
+
hunk ./ReleaseNotes/changelog-sip2sip.html 9
+<h2>Version 4.0.1</h2>
+
+<p>February 12th, 2016
+
+<ul>
+<li>OTR encryption fixes
+</ul>
+
+
hunk ./ReleaseNotes/changelog-sip2sip.html 9
+<h2>Version 4.0.2</h2>
+
+<p>February 13th, 2016
+
+<ul>
+<li>More OTR encryption fixes
+<li>Fixed call transfer
+</ul>
+
+
:
hunk ./ReleaseNotes/changelog-sip2sip.html 9
-<h2>Version 4.0.2</h2>
+<h2>Version 4.0.3</h2>