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: merge authors in from tiling.

SVN revision: 79709
---
 AUTHORS | 2 ++
 1 file changed, 2 insertions(+)

(limited to 'AUTHORS')

diff --git a/AUTHORS b/AUTHORS
index 5a23e06230..619067a492 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>
-- 
cgit v1.2.1