From 07d6e9b18b01399cde172ad8c5683c1651fbab3b Mon Sep 17 00:00:00 2001
From: Marcin Zajaczkowski <szpak@users.sourceforge.net>
Date: Aug 15 2010 21:14:54 +0000
Subject: Merge commit 'origin/f12/master'


Conflicts:
	.gitignore
	asunder.spec
	sources

---

diff --git a/.gitignore b/.gitignore
index 4d2c9d4..454f5b5 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1 @@
-asunder-1.9.3.tar.bz2
 asunder-2.0.tar.bz2