Merge branch 'patch-1' of git://github.com/NomAnor/ferm
commit9998d49c5302606a87a2f5f0a87437323838337d
authorMax Kellermann <max.kellermann@gmail.com>
Thu, 9 Nov 2017 07:47:29 +0000 (9 08:47 +0100)
committerMax Kellermann <max.kellermann@gmail.com>
Thu, 9 Nov 2017 07:47:29 +0000 (9 08:47 +0100)
treec8300d964fe4284ad975dd1fc543a5915f3f71fa
parenta14f125ea885b950db738991a36a9aa3fef472e0
parent2a0de7d8178e1f9a4d79cb58b112043886fedbea
Merge branch 'patch-1' of git://github.com/NomAnor/ferm
src/ferm