This is 'libreoffice-3-4' - the stable branch for the 3.4.x releases

    + only bug fixes are allowed
    + no approval needed during beta phase (two weeks after branch)
    + 1 approval needed during rc phase and for bugfix releases
    + 2 approvals with different/no affiliation needed for late features
    + regularly merged into master by a selected person when living

Please watch http://wiki.documentfoundation.org/ReleasePlan
and read announces on libreoffice@lists.freedesktop.org

If you want to build something cool, unstable, and risky, use master.

 - chart2/qa/unoapi
 - configmgr/qa/unoapi
 - dbaccess/qa/unoapi
 - forms/qa/complex/forms
 - linguistic/qa/unoapi
 - qadevOOo/qa/unoapi
 - sd/qa/unoapi
 - starmath/qa/unoapi
 - ucb/qa/complex/ucb
 - ucb/qa/unoapi
 - unotools/qa/complex/tempfile

Conflicts:
	sd/source/ui/toolpanel/TaskPaneFocusManager.cxx
	slideshow/source/engine/debug.cxx
	slideshow/source/engine/transitions/randomwipe.cxx

Conflicts:
	sd/source/ui/func/fuinsfil.cxx
	sd/source/ui/func/fuprobjs.cxx
	sd/source/ui/slideshow/slideshowimpl.cxx
	sd/source/ui/slidesorter/view/SlsPageObjectViewObjectContact.cxx
	sd/source/ui/toolpanel/ToolPanelViewShell.cxx
	sd/source/ui/view/drawview.cxx
	sd/source/ui/view/drtxtob.cxx
	sd/source/ui/view/outlnvsh.cxx
	sd/source/ui/view/outlview.cxx