[kdepimlibs/f17: 3/3] Merge branch 'f18' into f17

[Than Ngo]

commit 058153fe3b82d87bcd13456402c118e89b9c70bd
Merge: 2b6df96 df2e897
Author: Than Ngo <than at redhat.com>
Date:   Thu Dec 6 15:33:44 2012 +0100

    Merge branch 'f18' into f17

 .gitignore                                         |    1 +
 ...o-html-image-when-image-has-specific-size.patch |   32 -----
 ...ic-fallback-for-SSL-TLS-protocol-versions.patch |  139 --------------------
 ...accept-richtext-it-stores-data-as-plainte.patch |   24 ----
 ...-Fix-error-reporting-by-Albert-Astals-Cid.patch |   55 --------
 ...online-offline-setting-requested-by-a-cli.patch |  130 ------------------
 kdepimlibs.spec                                    |   20 +--
 sources                                            |    2 +-
 8 files changed, 7 insertions(+), 396 deletions(-)
---