# HG changeset patch
# User sevil <sevil@sevilnatas.ano>
# Date 1312816361 0
# Node ID f822bc52987c2c91a061c925c0af52f42d28a05e
# Parent  8b805f369af2ce7ca9fb0450d20d98feb7134b75# Parent  618448765814c94260c182e49517a7df12781b47
Merge remote branch 'srn/master'

diff -r 618448765814 -r f822bc52987c db/dom/ano/sevilnatas/ns0.sevilnatas.ano
diff -r 618448765814 -r f822bc52987c db/dom/ano/sn/ns0.sevilnatas.ano