[gnome-activity-journal/f13/master: 2/2] Merge branch 'master' into f13

[Mads Villadsen]

commit b027537f66896ad4a1f2367a68b7328b83cb0c16
Merge: 7a9c5ca 02cff32
Author: Mads Villadsen <maxx at krakoa.dk>
Date:   Thu Jan 27 00:29:06 2011 +0100

    Merge branch 'master' into f13

 .gitignore                  |    1 +
 gnome-activity-journal.spec |   12 ++++++++++--
 sources                     |    2 +-
 3 files changed, 12 insertions(+), 3 deletions(-)
---
diff --cc .gitignore
index 9f10ef2,7b865ab..72762fe
--- a/.gitignore
+++ b/.gitignore
@@@ -1,2 -1,4 +1,3 @@@
 -gnome-activity-journal-0.3.4.1-bzr1010.tar.gz
  /gnome-activity-journal-0.5.0.tar.gz
  /gnome-activity-journal-0.5.0.1.tar.gz
+ /gnome-activity-journal-0.6.0.tar.gz