From f0a00152094e498798f27e7441dd50cff50b528c Mon Sep 17 00:00:00 2001
From: Tim Byrne <sultan@locehilios.com>
Date: Fri, 22 Apr 2016 16:33:02 -0500
Subject: [PATCH] Release 1.04

Update version number and update documentation

  * Support alternate paths for yadm data (#4, #5)
  * Support asymmetric encryption (#7, #8)
  * Prevent the mixing of output and gpg prompts
---
 CHANGES      | 7 ++++++-
 CONTRIBUTORS | 1 +
 README.md    | 4 ++--
 yadm         | 2 +-
 yadm.1       | 2 +-
 yadm.spec    | 2 +-
 6 files changed, 12 insertions(+), 6 deletions(-)

diff --git a/CHANGES b/CHANGES
index fbcce78..35c86cc 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1,5 +1,10 @@
+1.04
+  * Support alternate paths for yadm data (#4, #5)
+  * Support asymmetric encryption (#7, #8)
+  * Prevent the mixing of output and gpg prompts
+
 1.03
-  * Add username matching for alternate files (PR #1)
+  * Add username matching for alternate files (#1)
 
 1.02
   * Handle permissions for `~/.gnupg/*gpg`
diff --git a/CONTRIBUTORS b/CONTRIBUTORS
index 035f040..70b9a52 100644
--- a/CONTRIBUTORS
+++ b/CONTRIBUTORS
@@ -1,5 +1,6 @@
 CONTRIBUTORS
 
 Tim Byrne
+Espen Henriksen
 Franciszek Madej
 Patrick Hof
diff --git a/README.md b/README.md
index bb6865b..7c1b706 100644
--- a/README.md
+++ b/README.md
@@ -31,8 +31,8 @@ _Seek home for rest, for home is best._—Thomas Tusser
 
 Or if not using yum, you can just directly download the RPM
 
-    curl -fLO https://dl.bintray.com/thelocehiliosan/rpm/yadm-1.02-1.noarch.rpm
-    sudo rpm -ivh yadm-1.02-1.noarch.rpm
+    curl -fLO https://dl.bintray.com/thelocehiliosan/rpm/yadm-1.04-1.noarch.rpm
+    sudo rpm -ivh yadm-1.04-1.noarch.rpm
 
 #### Arch Linux
 
diff --git a/yadm b/yadm
index 2be7c10..3fc86e3 100755
--- a/yadm
+++ b/yadm
@@ -15,7 +15,7 @@
 # You should have received a copy of the GNU General Public License
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
-VERSION=1.03
+VERSION=1.04
 
 YADM_WORK="$HOME"
 YADM_DIR="$HOME/.yadm"
diff --git a/yadm.1 b/yadm.1
index 4a65f33..a8b791d 100644
--- a/yadm.1
+++ b/yadm.1
@@ -1,5 +1,5 @@
 ." vim: set spell so=8:
-.TH yadm 1 "08 January 2016" "1.03"
+.TH yadm 1 "22 April 2016" "1.04"
 .SH NAME
 yadm \- Yet Another Dotfiles Manager
 .SH SYNOPSIS
diff --git a/yadm.spec b/yadm.spec
index d63de76..fb5346b 100644
--- a/yadm.spec
+++ b/yadm.spec
@@ -1,6 +1,6 @@
 Summary: Yet Another Dotfiles Manager
 Name: yadm
-Version: 1.02
+Version: 1.04
 Release: 1
 URL: https://github.com/TheLocehiliosan/yadm
 License: GPL