tree 220bd4aa5b62573d437acfcff614bcb17c3069e8
parent ff5f76b00482d2ad8192607de70c28e3663e5ddd
parent 768db4a6c02ed1338849979ec3f63effdd60b386
author Gilles <erans@apache.org> 1480414536 +0100
committer Gilles <erans@apache.org> 1480414536 +0100

Merge branch 'master' into 1.0-release

RC4.