From 28e5585dc3d6b74851cd23b6f729ff7004e46d49 Mon Sep 17 00:00:00 2001
From: netblue30 <netblue30@yahoo.com>
Date: Sun, 13 Aug 2017 09:53:49 -0400
Subject: merges

---
 README   | 2 ++
 RELNOTES | 2 +-
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/README b/README
index fefdedd94..f2dc9ec91 100644
--- a/README
+++ b/README
@@ -336,6 +336,8 @@ pirate486743186 (https://github.com/pirate486743186)
 	- KMail profile
 Pixel Fairy (https://github.com/xahare)
 	- added fjclip.py, fjdisplay.py and fjresize.py in contrib section
+PizzaDude (https://github.com/pizzadude)
+	- add mpv support to smplayer
 pshpsh (https://github.com/pshpsh)
 	- added FossaMail profile
 pstn (https://github.com/pstn)
diff --git a/RELNOTES b/RELNOTES
index 8b29b734a..25cacb281 100644
--- a/RELNOTES
+++ b/RELNOTES
@@ -1,6 +1,6 @@
 firejail (0.9.49) baseline; urgency=low
   * work in progress!
-  * modif: --output split in two commands: --output and --output-stderr
+  * modif: --output split in two commands, --output and --output-stderr
   * feature: per-profile disable-mnt (--disable-mnt)
   * feature: per-profile support to set X11 Xephyr screen size (--xephyr-screen)
   * enhancement: /proc/sys mounting
-- 
cgit v1.2.3-54-g00ecf