Merge branch 'stable-2.11' into stable-2.12

* stable-2.11:
  Add correct license for asciidoctor
  SshDaemon: Set up the session timeout to make sshd.idleTimeout work

Change-Id: If8fd11f198345d6a92fff3fa64851bd0e2b3376d
This commit is contained in:
David Pursehouse
2016-08-19 16:57:53 +09:00
3 changed files with 23 additions and 1 deletions

View File

@@ -7,6 +7,7 @@ define_license(name = 'MPL1.1')
define_license(name = 'PublicDomain')
define_license(name = 'antlr')
define_license(name = 'args4j')
define_license(name = 'asciidoctor')
define_license(name = 'automaton')
define_license(name = 'bouncycastle')
define_license(name = 'clippy')