# HG changeset patch
# User Nattee Niparnan <nattee@gmail.com>
# Date 2016-08-09 11:47:45
# Node ID 1f57df0c7868efe62ce705be5b673c0ead2f7525
# Parent  4afa0e9c66d262d4965522765b7d93ade1905e59
# Parent  f07dd230dab030703e2e74b9db9aa52b031eace3

merge