* Merge new upstream from Ubuntu.

* New upstream release.
  ∘ Set the type before other variables to get default handling more
    reliable (LP: #723873)
  ∘ Add support for overriding the default icon with a specific one
    for the messaging menu (LP: #741068)

1 files changed, 40 insertions, 0 deletions

diff --git a/ChangeLog b/ChangeLog
index b2f99f3..03a520e 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,45 @@
 # Generated by Makefile. Do not edit.
 
+2011-04-07  Ted Gould  <ted@gould.cx>
+
+	0.4.0
+
+2011-04-06  Ted Gould  <ted@gould.cx>
+
+	Add support for a specific icon on the menu
+
+2011-04-06  Ted Gould  <ted@gould.cx>
+
+	Attaching bug
+
+2011-04-06  Ted Gould  <ted@gould.cx>
+
+	Look for the override icon in the keyfile
+
+2011-04-06  Ted Gould  <ted@gould.cx>
+
+	move ICON_KEY
+
+2011-04-06  Ted Gould  <ted@gould.cx>
+
+	Create the keyfile for the application icon as well
+
+2011-04-06  Ted Gould  <ted@gould.cx>
+
+	Checking for the ayatana override in the keyfile
+
+2011-04-06  Ted Gould  <ted@gould.cx>
+
+	Making it so that we store the keyfile as well.  Sad we need to do this.
+
+2011-02-24  Ted Gould  <ted@gould.cx>
+
+	Set the type before the other variables
+
+2011-02-23  Ted Gould  <ted@gould.cx>
+
+	Make sure to set the type of the item before all the values.
+
 2011-02-17  Ted Gould  <ted@gould.cx>
 
 	0.3.92