Merge pull request #105 from wigyori/chaos_calmer
authorZoltan Herpai <wigyori@uid0.hu>
Thu, 29 Sep 2016 13:49:20 +0000 (15:49 +0200)
committerGitHub <noreply@github.com>
Thu, 29 Sep 2016 13:49:20 +0000 (15:49 +0200)
CC: openssl security upgrade, sync updates from git.openwrt.org/chaos_calmer

Trivial merge