Merge branch 'develop' v0.2.3
authorZhang Xianyi <traits.zhang@gmail.com>
Mon, 20 Aug 2012 08:52:35 +0000 (16:52 +0800)
committerZhang Xianyi <traits.zhang@gmail.com>
Mon, 20 Aug 2012 08:52:35 +0000 (16:52 +0800)
commit48f075cfd52b73bf77d7627fcb425392c4d6bf24
tree852616f3e495a6c5643c649c70240f2b03858975
parent71d29fa3d0e47e3b3f17bd15b63ae4dad66e7efa
parent3e87648de33e1ad9bdc14c96ae3897edf0816f03
Merge branch 'develop'