Merge branch 'passwd'
commit6697f1ef31d5ce39a73b86866b0afa53bb541864
authorLauri Tirkkonen <lotheac@iki.fi>
Thu, 9 Feb 2017 07:23:53 +0000 (9 09:23 +0200)
committerLauri Tirkkonen <lotheac@iki.fi>
Thu, 9 Feb 2017 07:23:53 +0000 (9 09:23 +0200)
tree0cfe8cf6f8fc146810b3d545cbff6f448fe90eb6
parent7355b4b76b67d122428b22aadeeb509b2de4143b
parent832171df496abff014dccc81a2f8d8469c0c362a
Merge branch 'passwd'