merge from mainline

git-svn-id: https://svn.dealii.org/branches/branch_sharedtria@32807 0785d39b-7218-0410-832d-ea1e28bc413d

diff --cc deal.II/include/deal.II/dofs/dof_tools.h
Simple merge

diff --cc deal.II/include/deal.II/grid/tria_accessor.templates.h
Simple merge

diff --cc deal.II/source/distributed/tria.cc
Simple merge

diff --cc deal.II/source/dofs/dof_tools.cc
Simple merge