Merge branch 'master' into 1348-local

Conflicts:
	lib/linguist/samples.json
This commit is contained in:
Arfon Smith
2014-08-13 15:32:51 -07:00
4 changed files with 814 additions and 166 deletions

View File

@@ -1633,6 +1633,7 @@ Perl:
extensions:
- .pl
- .PL
- .cgi
- .fcgi
- .perl
- .ph

File diff suppressed because it is too large Load Diff