# HG changeset patch
# User Nattee Niparnan <nattee@gmail.com>
# Date 2015-02-06 03:04:09
# Node ID 11b9beeb774c7edfc01b49bf6d690726b1154caf
# Parent  fda7b196726934394a993019d3f3c8f35347f2b6
# Parent  915396c14fc664203d490cea53a901c70376065b

logical merge