Merge pull request #674 from j-bo/develop
authorZhang Xianyi <traits.zhang@gmail.com>
Tue, 27 Oct 2015 15:49:22 +0000 (10:49 -0500)
committerZhang Xianyi <traits.zhang@gmail.com>
Tue, 27 Oct 2015 15:49:22 +0000 (10:49 -0500)
commitb6519159f502ef6dba1ea20c58649f9835606cda
treefc0fcea2075e7c5fc3cc7db88a275a766cc69741
parent63c56d3da93f80f704144750ba7bbf5887bbb5a4
parent718d0f18e38ae1a9cebf618bd34fef65a24b363e
Merge pull request #674 from j-bo/develop

Fix #673