ref: 4757e299be8c7c6981b75b1159bf5e3d28ee544e
parent: b9110b015d5ebaffa9cd1f8d0c1ec73aed95911d
parent: 1ba907e3539f51c70c95eed6189c14cea259b71a
author: yenatch <[email protected]>
date: Sat Jul 19 07:59:33 EDT 2014
Merge remote-tracking branch 'kanzure/master' into cries