Merge remote-tracking branch 'upstream/master' into mercury-noconflict

This commit is contained in:
Sebastian Godelet
2014-04-18 12:28:18 +02:00
2 changed files with 2 additions and 1 deletions

View File

@@ -1873,6 +1873,7 @@ XML:
- .kml
- .launch
- .mxml
- .osm
- .plist
- .pluginspec
- .ps1xml