From: Ian Jackson <Ian.Jackson@eu.citrix.com>
Date: Fri, 20 Feb 2015 15:14:17 +0000 (+0000)
Subject: Merge branch 'cvsimport'
X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=sympathy.git;a=commitdiff_plain;h=d3a389bb8820859175314ef2f329d863d31d2b3f

Merge branch 'cvsimport'

Use -s ours, as source from woking is strictly newer.

Signed-off-by: Ian Jackson <Ian.Jackson@eu.citrix.com>
---

d3a389bb8820859175314ef2f329d863d31d2b3f