# HG changeset patch
# User Da Risk <darisk972@gmail.com>
# Date 1260869386 -3600
# Node ID 62a94d12731d61887a4de15453735177e1f85b24
# Parent  a67f46ac98b1b9254cb52f0caffb5ec217ca904b# Parent  e791311fdc14bbe08db5a6f8c2523afe6a03ca51
merge

diff -r a67f46ac98b1 -r 62a94d12731d res/values-fr/strings.xml