# HG changeset patch
# User Parth buch <parth.buch.115@gmail.com>
# Date 1322922235 -19800
# Node ID 97c978a24a6db2bf3601d40454e232bda25ddf26
# Parent  3fcab949fc594b48ae41726cdcc835677ca0b320# Parent  26173d8787455e4f0893dc944565c77f3e5e9498
merged primal

diff -r 26173d878745 -r 97c978a24a6d project/templates/_right_menu.html
diff -r 26173d878745 -r 97c978a24a6d project/templates/talk/conf_schedule.html