From: Gustav Eek <gustav@fripost.org>
Date: Mon, 17 Aug 2015 07:26:47 +0000 (+0200)
Subject: Merge branch 'epsilon' into 'master'
X-Git-Url: https://git.g-eek.se/?a=commitdiff_plain;h=fd82a4ad3a244cef3b9e5c5462f70ef85a1fe159;p=users%2Fgustav%2Fscripts.git

Merge branch 'epsilon' into 'master'

Conflicts:
	Makefile
---

fd82a4ad3a244cef3b9e5c5462f70ef85a1fe159
diff --cc Makefile
index e023745,6249a04..7f114e1
--- a/Makefile
+++ b/Makefile
@@@ -7,7 -7,7 +7,8 @@@ INSTALL = $(HOME)/bi
  scripts = \
  msmtp-notify \
  repo-encrypt \
 -confluence-tk
 +exiv2-common-edits \
++confluence-tk \
  
  bash-completion = \
  repo-encrypt \