From 614db97773cb8903f53f58fb561e75ecd368c716 Mon Sep 17 00:00:00 2001
From: Grip Firmly <grip@firmly.com>
Date: Jun 26 2011 04:51:45 +0000
Subject: Merge commit 'refs/merge-requests/1' of git://gitorious.org/testautomation/t_functional into merge-requests/1


---

diff --git a/Authors b/Authors
index c722006..7de9f8d 100644
--- a/Authors
+++ b/Authors
@@ -4,4 +4,5 @@ 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>