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)
commit5b17019304a0e1382733a6dd77758eb3afd86453
tree7234a1c5c6c18ccd48d3916be72cbf9a19f20706
parent47d87165a170ece4ad84eafd15b06181b6adef2b
parent48cfc501096d9e411ca4f29fdc5f0daef3ac9452
Merge pull request #2917 from oneru/master

Nano: update to 2.6.0