[syncevolution/f20: 2/2] Merge branch 'master' into f20

[Peter Robinson]

commit 066ae79ee96ac4243589beff4d6fd44bb46857f0
Merge: 4a0a685 553b59f
Author: Peter Robinson <pbrobinson at gmail.com>
Date:   Mon Apr 14 13:23:45 2014 +0100

    Merge branch 'master' into f20

 sources            |    2 +-
 syncevolution.spec |    5 ++++-
 2 files changed, 5 insertions(+), 2 deletions(-)
---