Merge branch 'barry/fix-minor-matlabs'
Merge branch 'madams/gamg-nokkt'

* madams/gamg-nokkt:
  PCGAMG: remove dead function PCGAMGKKTProl_AGG
  PCGAMG: remove dead KKT code
Merge branch 'jed/pcmg-residual-underscore'

* jed/pcmg-residual-underscore:
  PCMGResidualDefault: fix fortran def [error on windows build]
  PCMGResidualDefault: deprecate old semi-private name and make public
  Fortran: PCMGResidual_Default needs to handle double-underscore
Merge branch 'jed/fix-chaco-default'

* jed/fix-chaco-default:
  Mat Chaco: remove another case of PETSC_DEFAULT out of range of enum

Conflicts:
	src/mat/partition/impls/chaco/chaco.c
Merge branch 'toby/ksp-dgmres-view'

* toby/ksp-dgmres-view:
  dgmres: doc for -ksp_dgmres_view_deflation_vecs
  dgmres: added option to view deflation vecs after solve.
  dgmres: fix real typed as int
Merge branch 'toby/pcfactorgetlevels'

* toby/pcfactorgetlevels:
  PCFactor: add PCFactorGetLevels
Merge branch 'maint'

* maint:
  fixed src/dm/examples/tutorials/ex7.c to use replacement for PetscViewerBinaryMatlabOpen()
  also needed to fix bin/matlab/PetscBagRead.m for new location of bagimpl.h
  and put bagimpl.h into the appropriate public place
Merge branch 'jed/fix-viewer-ascii-tab-whitespace'

* jed/fix-viewer-ascii-tab-whitespace:
  Viewer ASCII: print tabs to petsc_history, not fd
Merge branch 'jed/mat-factor-shift'

* jed/mat-factor-shift:
  Mat PCFactor: include MatFactorShiftType in PCView_Factor output
config: python-2.4 does not support decorators

This amends 2a571ffb5945aee7 to avoid decorators.
Merge branch 'jed/config-cleanup' into next

* jed/config-cleanup:
  config: python-2.4 does not support decorators
KSPChebyshev: use VecAXPBYPCZ instead of three separate Vec operations
update nightly tests
Merge branch 'hzhang/fix-tests' into next
Merge branch 'jed/ksp-cheby-axpbypcz' into next

* jed/ksp-cheby-axpbypcz:
  KSPChebyshev: use VecAXPBYPCZ instead of three separate Vec operations