[tomboy/f14: 4/4] Merge branch 'f15' into f14

[Thomas Moschny]

commit 2c9befc014c15a68ad50425a78df98d0a83590de
Merge: 879c14b ffe4971
Author: Thomas Moschny <thm at fedoraproject.org>
Date:   Sat Jul 9 13:46:19 2011 +0200

    Merge branch 'f15' into f14

 .gitignore                    |    1 +
 sources                       |    2 +-
 tomboy-1.7.0-ndesk-dbus.patch |  152 -----------------------------------------
 tomboy.spec                   |   16 +++--
 4 files changed, 12 insertions(+), 159 deletions(-)
---