Merge branch 'master' of git://github.com/snowleopard/hadrian
authorAndrey Mokhov <andrey.mokhov@gmail.com>
Mon, 2 May 2016 03:00:12 +0000 (04:00 +0100)
committerAndrey Mokhov <andrey.mokhov@gmail.com>
Mon, 2 May 2016 03:00:12 +0000 (04:00 +0100)

Trivial merge