# HG changeset patch
# User Parth buch <parth.buch.115@gmail.com>
# Date 1322903087 -19800
# Node ID 3fcab949fc594b48ae41726cdcc835677ca0b320
# Parent  08aaf89016e3b9ee2c7a35c4ad5e1f1fc4c99a14# Parent  3c981ecb6b8e0140274dd799801a0373d96d650b
merge

diff -r 08aaf89016e3 -r 3fcab949fc59 project/templates/_right_menu.html
diff -r 08aaf89016e3 -r 3fcab949fc59 project/templates/talk/conf_schedule.html