# HG changeset patch
# User IBBoard <dev@ibboard.co.uk>
# Date 1369251531 -3600
# Node ID 963fe1f38b503ed0b4ac4375d9bb5726df88a8b9
# Parent  c5f36962a8b56f223953610c8af48d81269877e9# Parent  c3b3813ab327c3dfee27cd3083cc07f38eefec57
 * Merge bad devel (created on end of a branch) into real devel (started from default branch revision 0)

diff -r c5f36962a8b5 -r 963fe1f38b50 Ooops.txt
diff -r c5f36962a8b5 -r 963fe1f38b50 otherfile
diff -r c5f36962a8b5 -r 963fe1f38b50 sub-branch-file