[git/f13/master: 11/11] Merge remote branch 'origin/master' into f13

[Adam Tkac]

commit 9b9ee67680b3e0953624cb7fd1d34e14940792f9
Merge: 17707f6 71a8c91
Author: Adam Tkac <atkac at redhat.com>
Date:   Fri Aug 20 11:10:29 2010 +0200

    Merge remote branch 'origin/master' into f13
    
    Conflicts:
    	.gitignore
    	git.spec
    	sources
    
    Signed-off-by: Adam Tkac <atkac at redhat.com>

 .gitignore |    2 +-
 git.spec   |    7 +++++--
 sources    |    2 +-
 3 files changed, 7 insertions(+), 4 deletions(-)
---
diff --cc .gitignore
index 1dd8967,51ec344..ade54be
--- a/.gitignore
+++ b/.gitignore
@@@ -1,1 -1,2 +1,1 @@@
--git-1.7.2.1.tar.bz2
 -/git-1.7.2.2.tar.bz2
++git-1.7.2.2.tar.bz2