[mr/f15: 4/4] Merge branch 'master' into f15

[Fabian Affolter]

commit 24555aebef5ee42dbd837fbc752122cb81440240
Merge: 18e734c 73f5e66
Author: Fabian Affolter <mail at fabian-affolter.ch>
Date:   Thu Jun 14 21:53:02 2012 +0200

    Merge branch 'master' into f15
    
    Conflicts:
    	.gitignore

 .gitignore |    1 +
 mr.spec    |    8 +++++++-
 sources    |    2 +-
 3 files changed, 9 insertions(+), 2 deletions(-)
---
diff --cc .gitignore
index ac6a089,604a6f6..189f222
--- a/.gitignore
+++ b/.gitignore
@@@ -6,7 -6,6 +6,8 @@@ mr_0.48.tar.g
  /mr_1.03.tar.gz
  /mr_1.04.tar.gz
  /mr_1.05.tar.gz
 +/mr_1.06.tar.gz
  /mr_1.10.tar.gz
  /mr_1.11.tar.gz
+ /mr_1.12.tar.gz
 +