Merge branch 'hotfix-v0.2.8' into develop
authorZhang Xianyi <traits.zhang@gmail.com>
Thu, 1 Aug 2013 15:57:19 +0000 (23:57 +0800)
committerZhang Xianyi <traits.zhang@gmail.com>
Thu, 1 Aug 2013 15:57:19 +0000 (23:57 +0800)
commit79ba52115d9fe65e5aade98d4265c054a8c34b8e
tree5b1c3b007251840dffe55fee3137ea395c7dbf00
parent36adfe8d64ce2a95e9e31284d99534dbe4ff609e
parentb736aa811089fddf586188447f4e25c77df3b103
Merge branch 'hotfix-v0.2.8' into develop