Shuffle glossary: the ManifoldId entry was in the wrong place.
Move an entry to the correct place. A couple of minor updates.
Fix bug in TrilinosVector::sadd with MPI

As pointed out by Praveen C on the mailing list, sadd() of the Trilinos vector did
not work properly when combining ghosted with non-ghosted vectors. The test supposed
to check this used two vectors with the same entries, which did not detect that the
wrong vector was scaled.
Merge pull request #178 from bangerth/shuffle-changelog

Move an entry to the correct place. A couple of minor updates.
Merge pull request #176 from bangerth/shuffle-glossary

Shuffle glossary: the ManifoldId entry was in the wrong place.
Merge pull request #174 from kronbichler/master

Fix bug in TrilinosVector::sadd with MPI
Allow Q(p) and DGQ(r) elements to touch each other in hp::DoFHandlers.

The thing is that the FE_DGQ is discontinuous anyway, so there can't be any constraints to begin with.
Merge pull request #175 from bangerth/fix-q-vs-dgq

Allow Q(p) and DGQ(r) elements to touch each other in hp::DoFHandlers.