Merge pull request #3845 from jp-bennett/master
authorTed Hess <thess@kitschensync.net>
Sun, 15 Jan 2017 22:00:25 +0000 (17:00 -0500)
committerGitHub <noreply@github.com>
Sun, 15 Jan 2017 22:00:25 +0000 (17:00 -0500)
nano: Update to version 2.7.4


Trivial merge