# HG changeset patch
# User Sebastien Jodogne <s.jodogne@gmail.com>
# Date 1351257587 -7200
# Node ID 9bb7e8277e151452126a2a2e4eb05f3e1da57045
# Parent  91ed72ab2b052e7d03140563c18321f23ecdb07b# Parent  f2ae23682353b69ed31ddf90dcad9af31317a47d
merge

diff -r f2ae23682353 -r 9bb7e8277e15 Resources/Configuration.json