Merge branch 'develop' v0.2.4
authorZhang Xianyi <traits.zhang@gmail.com>
Tue, 9 Oct 2012 12:08:28 +0000 (20:08 +0800)
committerZhang Xianyi <traits.zhang@gmail.com>
Tue, 9 Oct 2012 12:08:28 +0000 (20:08 +0800)
commit3a26470fb72ebde20397ab6c08dd8db8adc241b1
treec397b35f5ff39a5479407203dfe01b08030ad686
parent2df2878dfcfc389cb0e85278128a45e4cdec9142
parent6c5899dff5dc2e6f7fa6415046c1b99b4d6c0bbd
Merge branch 'develop'