Fixed #769. Merge branch 'martin-frbg-develop' into develop
authorZhang Xianyi <traits.zhang@gmail.com>
Tue, 2 Feb 2016 18:43:51 +0000 (13:43 -0500)
committerZhang Xianyi <traits.zhang@gmail.com>
Tue, 2 Feb 2016 18:43:51 +0000 (13:43 -0500)
commit52eba814ce5a9847b7e9db4a64239fd79ba5bffd
tree4173fab09e058fcf03f932f8129bb0e39dcedc00
parent962376664d6b79d19c91464a30be60fa304fdc44
parent935356c34f93eb4d4e6b7c5941ebd93aa21a3a7c
Fixed #769. Merge branch 'martin-frbg-develop' into develop