[akonadi: 3/4] Merge branch 'master' of ssh://pkgs.fedoraproject.org/akonadi

[Rex Dieter]

commit 38efab91cebfab4ff915eb4b23618d7269a3ee83
Merge: 6a8a357 205f64e
Author: Rex Dieter <rdieter at fedoraproject.org>
Date:   Sun Feb 6 14:44:06 2011 -0600

    Merge branch 'master' of ssh://pkgs.fedoraproject.org/akonadi

 .gitignore   |    3 +--
 akonadi.spec |    5 ++++-
 sources      |    2 +-
 3 files changed, 6 insertions(+), 4 deletions(-)
---