Merge branch 'foreign/qu/norecovery-v7' into for-chris-4.6

This commit is contained in:
David Sterba 2016-02-26 15:38:30 +01:00
commit 23c1a966f2
4 changed files with 67 additions and 18 deletions