Merge branch 'sadm'
commit9dacf55e1140eb0d841009558addd015908b4cb2
authorLauri Tirkkonen <lotheac@iki.fi>
Fri, 26 Jan 2018 07:22:16 +0000 (26 09:22 +0200)
committerLauri Tirkkonen <lotheac@iki.fi>
Fri, 26 Jan 2018 07:22:16 +0000 (26 09:22 +0200)
treee5eca24bce77393321f6068ad62f7930aea43204
parent86ae4bfb9a18bbcdb5f23c28280226954c8c2007
parent2b13d5e22523efcecce0eeb8383b90f4082591c7
Merge branch 'sadm'