From f42adad94bd8cf4f7a86bdced796bb88ec7e5bb2 Mon Sep 17 00:00:00 2001
From: David Engster
Date: Thu, 27 Nov 2014 18:22:00 +0100
Subject: admin: Add gitmerge.el

* gitmerge.el: New file.
---
 admin/ChangeLog | 4 ++++
 1 file changed, 4 insertions(+)

(limited to 'admin/ChangeLog')

diff --git a/admin/ChangeLog b/admin/ChangeLog
index 6d134046a38..c30e4bea5b6 100644
--- a/admin/ChangeLog
+++ b/admin/ChangeLog
@@ -1,3 +1,7 @@
+2014-11-27  David Engster  <deng@randomsample.de>
+
+	* gitmerge.el: New file.
+
 2014-11-17  Oscar Fuentes  <ofv@wanadoo.es>
 
 	* admin/CPP-DEFINES: Mention MINGW_W64.
-- 
cgit v1.2.1