Merge branch 'jeromerobert-bug736' into develop
authorZhang Xianyi <traits.zhang@gmail.com>
Tue, 12 Jan 2016 22:25:08 +0000 (22:25 +0000)
committerZhang Xianyi <traits.zhang@gmail.com>
Tue, 12 Jan 2016 22:25:08 +0000 (22:25 +0000)
commit96b486acee302f183dc5de98fc24ecee7f172155
treeeb31bf7511b3c3963dd56e7ab303448368b0cb60
parentc6a27bbe64f7c88a5a2bc48b54e152f52dc9eec3
parent3602a2cd1f90cdb441fa64d9c8d8e3e34d9a7bf4
Merge branch 'jeromerobert-bug736' into develop