tree df99d04bffcec2774755c09d088961c0015290d7
parent 36d143b6d06e22d8a64d4d5a5abb88463bb33b52
parent 3640f3cc73b76565248f16b6a55a76549798aa83
author Nguyen Anh Quynh <aquynh@gmail.com> 1385828918 +0800
committer Nguyen Anh Quynh <aquynh@gmail.com> 1385828918 +0800

Merge branch 'master' into x86