Fixed #251. Merge branch 'grisuthedragon-develop' into develop
authorZhang Xianyi <traits.zhang@gmail.com>
Thu, 11 Jul 2013 13:41:44 +0000 (21:41 +0800)
committerZhang Xianyi <traits.zhang@gmail.com>
Thu, 11 Jul 2013 13:42:04 +0000 (21:42 +0800)
commit824c3c4df362f93bb3df4fedadb98ca2049457d0
treea8078cb17b15849082032f9d90e5e2b42f7dea06
parent32d2ca3035d76e18b2bc64c7bfbe3fad2dba234b
parentc19a488af25578f40dd99f44cc5a9c1e81ba3f65
Fixed #251. Merge branch 'grisuthedragon-develop' into develop