Merge branch 'errc'
commit8274a5d3aa648a058a5ba5de7a2ffa091a63dd3f
authorLauri Tirkkonen <lotheac@iki.fi>
Wed, 7 Dec 2016 13:37:35 +0000 (7 15:37 +0200)
committerLauri Tirkkonen <lotheac@iki.fi>
Wed, 7 Dec 2016 13:37:35 +0000 (7 15:37 +0200)
tree00418fc27303ab237d8c99ad7848b39ddb149769
parentb6e91504b3cc4190de26e0aaee4112f9e4487845
parent5a34051a0cd537c801991b1468c400e274182e75
Merge branch 'errc'