# HG changeset patch
# User sevil <sevil@sevilnatas.ano>
# Date 1312389438 0
# Node ID 8b805f369af2ce7ca9fb0450d20d98feb7134b75
# Parent  416cfd4e39bcb834131d268e24789dd5aa713870# Parent  dd3e1318b3e46606e699a36a39924eefc16711b9
Merge remote branch 'srn/master'

diff -r dd3e1318b3e4 -r 8b805f369af2 db/dom/ano/sevilnatas/ns0.sevilnatas.ano
diff -r dd3e1318b3e4 -r 8b805f369af2 db/dom/ano/sn/ns0.sevilnatas.ano