From 20d25f223563a70e7bdb577dbdc3f5add2ebbe2f Mon Sep 17 00:00:00 2001
From: Hylke Bons <hylkebons@gmail.com>
Date: Wed, 21 Jan 2015 11:24:52 +0000
Subject: [PATCH] Update News.txt

---
 News.txt | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/News.txt b/News.txt
index 26afc748..e6513f49 100755
--- a/News.txt
+++ b/News.txt
@@ -1,6 +1,6 @@
 1.5.0 for Linux, Mac and Windows (???):
 
-     Hylke
+     Hylke:
      - Mac UI updates to integrate well with Yosemite
      - Per folder sync status in icon menu
      - Add ability to pause sync and add a commit message on resume
@@ -11,6 +11,8 @@
      - Improvements to filesystem watcher and exclude list
      - Use more secure 4096 bit SSH keys
      - Use hashed and salted password to encrypt files
+     - Fix change attribution in Recent Changes window on merges
+
 
 1.4.0 for Linux, Mac and Windows (Sun Apr 20, 2014):