From 5f321f3122e564b31138bf4a695d9fe84e54ce4a Mon Sep 17 00:00:00 2001
From: Athmane Madjoudj <athmane@fedoraproject.org>
Date: Aug 30 2011 16:26:02 +0000
Subject: Merge branch 'master' of gitorious.org:testautomation/t_functional


---

diff --git a/AUTHORS b/AUTHORS
index 7de9f8d..c722006 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -4,5 +4,4 @@ Karanbir Singh <kbsingh@karan.org>
 Fabian Arrotin <arrfab@centos.org>
 Athmane Madjoudj <athmanem@gmail.com>
 Steve Barnes <steve@echo.id.au>
-Marian Marinov <mm@yuhu.biz>