Automated merge with file:///Users/oz/Work/V-D

.hgtags

doc/contributions.txt

indra/newview/app_settings/ignorable_dialogs.xml

indra/newview/app_settings/settings.xml

indra/newview/llbottomtray.cpp

indra/newview/llcallfloater.cpp

indra/newview/llfirstuse.cpp

indra/newview/llfirstuse.h

indra/newview/llfloaterbeacons.cpp

indra/newview/llfriendcard.cpp

indra/newview/llsidetray.cpp

indra/newview/llspeakbutton.cpp

indra/newview/llviewermenu.cpp

indra/newview/llviewerwindow.cpp

indra/newview/pipeline.cpp

indra/newview/pipeline.h

indra/newview/skins/default/xui/en/floater_beacons.xml

indra/newview/skins/default/xui/en/menu_bottomtray.xml

indra/newview/skins/default/xui/en/notifications.xml