tree b5dcf02324e2b7d0cfbaca1f95dede02b5c984af
parent 98bce0f172530a0ee7b98f3076f610ae90770ee6
parent 59caae0cdaf16085c19b79e4f4b8d09ecc97e21d
author Nguyen Anh Quynh <aquynh@gmail.com> 1401892942 +0700
committer Nguyen Anh Quynh <aquynh@gmail.com> 1401892942 +0700

Merge branch 'next' into cmake2