[akonadi/f13/master: 3/3] Merge remote branch 'origin/master' into f13/master

[Rex Dieter]

commit 242fd6cb449fb62c41278c5e67aa1ef4252603f4
Merge: d8f044d f9849ec
Author: Rex Dieter <rdieter at fedoraproject.org>
Date:   Sat Nov 6 13:50:51 2010 -0500

    Merge remote branch 'origin/master' into f13/master

 .gitignore                                         |    2 +-
 ...server-1.4.0-remove-sqlite-version-assert.patch |   11 +++++++++++
 akonadi.spec                                       |   13 +++++++++++--
 sources                                            |    2 +-
 4 files changed, 24 insertions(+), 4 deletions(-)
---