Merge branch 'foreign/anand/dev-del-by-id-ext' into for-chris-4.7-20160516

This commit is contained in:
David Sterba 2016-05-16 15:46:26 +02:00
commit 36fac9e9ff
6 changed files with 324 additions and 242 deletions