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

[Peter Robinson]

commit 4a0a685e152c4ab3bf7b22df432c40632dac677f
Merge: 3508a73 ec441c8
Author: Peter Robinson <pbrobinson at gmail.com>
Date:   Wed Feb 19 12:13:31 2014 +0000

    Merge branch 'master' into f20

 sources            |    2 +-
 syncevolution.spec |   28 +++++++++++++++++++---------
 2 files changed, 20 insertions(+), 10 deletions(-)
---