[diffuse/f14: 4/4] Merge branch 'master (Updated to 0.4.5)' into f14

[Jon Levell]

commit db3d584d6b0c7312aa0bbc8f8ea970f89efc4227
Merge: 73c6ada 11c9784
Author: Jon Levell <fedora at coralbark.net>
Date:   Wed Oct 19 22:49:45 2011 +0100

    Merge branch 'master (Updated to 0.4.5)' into f14

 .gitignore   |    3 +--
 diffuse.spec |   12 ++++++++----
 sources      |    2 +-
 3 files changed, 10 insertions(+), 7 deletions(-)
---
diff --cc .gitignore
index e4370ea,88ac76a..ce7630a
--- a/.gitignore
+++ b/.gitignore
@@@ -1,2 -1,3 +1,1 @@@
--diffuse-0.4.0.tar.bz2
--diffuse-0.4.3.tar.bz2
+ /diffuse-0.4.5.tar.bz2
diff --cc diffuse.spec
index 6703ba8,bfe772e..756333f
--- a/diffuse.spec
+++ b/diffuse.spec
@@@ -64,6 -65,12 +65,9 @@@ update-desktop-database &> /dev/null |
  %doc AUTHORS ChangeLog COPYING README
  
  %changelog
+ * Wed Oct 19 2011 Jon Levell <fedora at coralbark.net> - 0.4.5-1
+ - Update to 0.4.5 upstream release
+ 
 -* Tue Feb 08 2011 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.4.3-2
 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild
 -
  * Tue Aug 10 2010 Jon Levell <fedora at coralbark.net> - 0.4.3-1
  - Update to 0.4.3 upstream release