Merge pull request #2917 from oneru/master
authorYousong Zhou <yszhou4tech@gmail.com>
Sun, 3 Jul 2016 09:54:54 +0000 (17:54 +0800)
committerGitHub <noreply@github.com>
Sun, 3 Jul 2016 09:54:54 +0000 (17:54 +0800)
Nano: update to 2.6.0


Trivial merge