merge

.hgtags

doc/contributions.txt

indra/llcommon/llerror.cpp

indra/llcommon/llerrorcontrol.h

indra/llcommon/llversionviewer.h

indra/llui/llbutton.cpp

indra/llui/lllayoutstack.h

indra/llui/llmenugl.cpp

indra/llui/llpanel.h

indra/llui/lltabcontainer.cpp

indra/llui/lltextbase.cpp

indra/llui/lltextbase.h

indra/llui/lltexteditor.cpp

indra/llui/lltexteditor.h

indra/llui/llview.cpp

indra/llui/llview.h

indra/llui/llwindowshade.cpp

indra/llui/llwindowshade.h

indra/llwindow/llwindow.cpp

indra/newview/app_settings/settings.xml