[gummi/f16: 3/3] Merge branch 'master' into f16

[Fabian Affolter]

commit 1b3c40c62bec41f57a475cf830cf8147654478c1
Merge: 36c99d2 2b97e96
Author: Fabian Affolter <mail at fabian-affolter.ch>
Date:   Thu Nov 15 21:48:00 2012 +0100

    Merge branch 'master' into f16
    
    Conflicts:
    	.gitignore

 .gitignore |    3 ++-
 gummi.spec |    7 +++++--
 sources    |    2 +-
 3 files changed, 8 insertions(+), 4 deletions(-)
---
diff --cc .gitignore
index 990dd44,e744799..65044c1
--- a/.gitignore
+++ b/.gitignore
@@@ -1,4 -1,4 +1,4 @@@
--gummi-0.4.8.tar.gz
++/gummi-0.4.8.tar.gz
  /gummi-0.5.0.tar.gz
  /gummi-0.5.3.tar.gz
  /gummi-0.5.5.tar.gz
@@@ -7,4 -7,4 +7,5 @@@
  /gummi-0.6.2.tar.gz
  /gummi-0.6.3.tar.gz
  /gummi-0.6.4.tar.gz
+ /gummi-0.6.5.tar.gz
 +