# HG changeset patch
# User IBBoard <dev@ibboard.co.uk>
# Date 1314385492 -3600
# Node ID 20274b5b0fd64bea51962fa7a7597a7fc0d0b9fe
# Parent  376da2b24de1e99ab7747fc1bb35bc24e12b786b# Parent  47ae48fd1f02de598eaf732bfe32253e8a43379d
 * Merge branch (code already merged in Subversion, but Mercurial kept the branch)

diff -r 376da2b24de1 -r 20274b5b0fd6 IBBoard.WarFoundry.API.csproj
diff -r 376da2b24de1 -r 20274b5b0fd6 schemas/system.xsd