From a59c6a8865ee25e415c0711d2d280c3e781ae134 Mon Sep 17 00:00:00 2001
From: Michele Redolfi <news@tecnicaict.com>
Date: Fri, 31 May 2013 12:24:12 +0200
Subject: [PATCH 1/2] fix bug: JS error when pdf contained single quotes in its
 name; add myself in AUTHORS as kindly request by Lu

---
 AUTHORS              | 1 +
 src/util/encoding.cc | 1 +
 2 files changed, 2 insertions(+)

diff --git a/AUTHORS b/AUTHORS
index d4bda5d..ccd9dff 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -7,6 +7,7 @@ Hongliang Tian <tatetian@gmail.com>
 John Hewson <john@jahewson.com>
 Lu Wang <coolwanglu@gmail.com>
 Ryan Morlok <ryan.morlok@morlok.com>
+Michele Redolfi <michele@tecnicaict.com>
 
 Packagers:
 Arthur Titeica <arthur.titeica@gmail.com>
diff --git a/src/util/encoding.cc b/src/util/encoding.cc
index 5abecb2..157f3eb 100644
--- a/src/util/encoding.cc
+++ b/src/util/encoding.cc
@@ -135,6 +135,7 @@ void outputJSON(ostream & out, const string & s)
         {
             case '\\': out << "\\\\"; break;
             case '"': out << "\\\""; break;
+            case '\'': out << "\\\'"; break;
             case '/': out << "\\/"; break;
             case '\b': out << "\\b"; break;
             case '\f': out << "\\f"; break;

From 933efc1d6c525ea33c4ac5c402f5494537244b5d Mon Sep 17 00:00:00 2001
From: Michele Redolfi <news@tecnicaict.com>
Date: Fri, 31 May 2013 12:43:31 +0200
Subject: [PATCH 2/2] lex order

---
 AUTHORS | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/AUTHORS b/AUTHORS
index ccd9dff..916c9ff 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -6,8 +6,8 @@ Herbert Jones <herbert@mediafire.com>
 Hongliang Tian <tatetian@gmail.com>
 John Hewson <john@jahewson.com>
 Lu Wang <coolwanglu@gmail.com>
-Ryan Morlok <ryan.morlok@morlok.com>
 Michele Redolfi <michele@tecnicaict.com>
+Ryan Morlok <ryan.morlok@morlok.com>
 
 Packagers:
 Arthur Titeica <arthur.titeica@gmail.com>