[kdepimlibs/f20: 11/11] Merge branch 'master' into f20

[Rex Dieter]

commit 7fb64114dbe20a84111bbc71ebf12e0223bb34a0
Merge: d0b4df9 a4c46ad
Author: Rex Dieter <rdieter at math.unl.edu>
Date:   Sun Feb 2 17:57:05 2014 -0600

    Merge branch 'master' into f20

 .gitignore                                         |    6 +
 0001-Fix-ImapStreamParser-CRLF-skipping.patch      |  226 -----------
 ...ttachments-with-their-filename-property-w.patch |   37 --
 0003-Fixed-refcounting-in-ETM-and-Monitor.patch    |  398 --------------------
 kdepimlibs.spec                                    |   34 ++-
 sources                                            |    2 +-
 6 files changed, 31 insertions(+), 672 deletions(-)
---