tree c70346b74fea20aa8c88527c8c0edce69587e570
parent f1f78fddee50fde8da1dc20480dc40ccf65db090
parent a4581164c75b3c889358836f2e1ae23e098d5540
author David Ostrovsky <david@ostrovsky.org> 1457415924 +0100
committer David Ostrovsky <david@ostrovsky.org> 1457415924 +0100

Merge pull request #2 from zaro0508/bring-up-to-date

Bring up to date with Gerrit master