Fixed a problem where path with stars was mixed up with a comment within a text delimiter characters
Merge pull request #31 from vvillee/master

Fixed a problem where path with stars was mixed up with a comment within...
added scala syntax highlighting v1
added scala.nanorc to the .nanorc template
Merge pull request #32 from paulinder/master

Added scala.nanorc
Update php.nanorc

A much better grammar for php.

Found and taken from: https://code.google.com/p/nanosyntax/issues/detail?id=4
Merge pull request #33 from sinaa/patch-1

Update php.nanorc
added puppet and ERB highlighting
Update php.nanorc

Small typo error fix
Merge pull request #35 from sinaa/patch-2

Update php.nanorc
Merge pull request #34 from liquidstate/puppetdevelopment

added puppet and ERB highlighting
Merge pull request #1 from scopatz/master

Update from origin