From 4dcc47508ebaa05f0ac3e73a1584cdf7bfdb4559 Mon Sep 17 00:00:00 2001
From: Carsten Haitzler <raster@rasterman.com>
Date: Mon, 26 Nov 2012 12:41:09 +0000
Subject: [PATCH] merge authors in from tiling.

SVN revision: 79709
---
 AUTHORS                    | 2 ++
 src/modules/tiling/AUTHORS | 2 --
 2 files changed, 2 insertions(+), 2 deletions(-)
 delete mode 100644 src/modules/tiling/AUTHORS

diff --git a/AUTHORS b/AUTHORS
index 5a23e0623..619067a49 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -44,3 +44,5 @@ Thanatermesis <thanatermesis.ecvs@gmail.com>
 Bruno Dilly <bdilly@profusion.mobi>
 Lucas De Marchi <lucas.demarchi@profusion.mobi>
 Samuel Mendes <heka.lok@gmail.com>
+Boris Faure <billiob@gmail.com>
+Michael Stapelberg <michael+e17@stapelberg.de>
diff --git a/src/modules/tiling/AUTHORS b/src/modules/tiling/AUTHORS
deleted file mode 100644
index 1ff354024..000000000
--- a/src/modules/tiling/AUTHORS
+++ /dev/null
@@ -1,2 +0,0 @@
-Boris Faure <billiob@gmail.com>
-Based on original Tiling module by Michael Stapelberg <michael+e17@stapelberg.de>