[asunder: 11/11] Merge commit 'origin/f12/master'

[Marcin Zajaczkowski]

commit 07d6e9b18b01399cde172ad8c5683c1651fbab3b
Merge: b3eda37 64c8c2f
Author: Marcin Zajaczkowski <szpak at users.sourceforge.net>
Date:   Sun Aug 15 23:14:54 2010 +0200

    Merge commit 'origin/f12/master'
    
    Conflicts:
    	.gitignore
    	asunder.spec
    	sources

 .gitignore |    1 -
 1 files changed, 0 insertions(+), 1 deletions(-)
---
diff --cc .gitignore
index 4d2c9d4,5301346..454f5b5
--- a/.gitignore
+++ b/.gitignore
@@@ -1,2 -1,1 +1,1 @@@
- asunder-1.9.3.tar.bz2
 -asunder-1.9.tar.bz2
 +asunder-2.0.tar.bz2