Merge branch 'master' into 2821-slim

This commit is contained in:
Arfon Smith
2016-03-17 10:23:59 -06:00
43 changed files with 199 additions and 76 deletions

View File

@@ -3863,6 +3863,7 @@ XML:
- .osm
- .plist
- .pluginspec
- .props
- .ps1xml
- .psc1
- .pt