Merge branch 'master' into 1036-local

This commit is contained in:
Arfon Smith
2014-10-23 12:16:51 +01:00
3 changed files with 32 additions and 0 deletions

View File

@@ -2202,6 +2202,7 @@ Shell:
- .bash
- .bats
- .cgi
- .command
- .fcgi
- .tmux
- .zsh