From 41d958f11feba8be0c9375a4c424e51fd83fa20e Mon Sep 17 00:00:00 2001
From: Evan Prodromou <evan@controlyourself.ca>
Date: Fri, 16 Jan 2009 16:43:10 +0000
Subject: [PATCH] Ignore .orig and .rej

---
 .gitignore | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/.gitignore b/.gitignore
index 8c94886e7c..f5a3e0212f 100644
--- a/.gitignore
+++ b/.gitignore
@@ -7,3 +7,5 @@ config.php
 dataobject.ini
 *~
 *.bak
+*.orig
+*.rej