Merge branch 'develop' v1.0.2-6
authorCuong Le <metacuong@gmail.com>
Fri, 16 Sep 2011 16:17:29 +0000 (23:17 +0700)
committerCuong Le <metacuong@gmail.com>
Fri, 16 Sep 2011 16:17:29 +0000 (23:17 +0700)
commit649ad7255868b5a2c00c25fb970f6fafcc247d81
tree40b3cbd93ebfada62b1840ce510e86f7358efb13
parentfb486527cda6dbc9bf1647bad27188e1938a37af
parentd01ec3d9bd846a032dee26a1debbdc32b3a7e565
Merge branch 'develop'