tree ef84bda263f4b58ace13bc22bf4fb33f03308223
parent 70fa5f780abd81901444b1d1fc617646eb7d258e
parent cb251de25ce7ccff74002deda9778715b07b288d
author Homu <homu@barosl.com> 1467395566 +0900
committer Homu <homu@barosl.com> 1467395566 +0900

Auto merge of #559 - kbknapp:issues-556,557, r=kbknapp

Issues 556,557