Merge branch 'develop' into release-0.2.16
authorZhang Xianyi <traits.zhang@gmail.com>
Tue, 15 Mar 2016 17:56:01 +0000 (13:56 -0400)
committerZhang Xianyi <traits.zhang@gmail.com>
Tue, 15 Mar 2016 17:56:01 +0000 (13:56 -0400)
commitaae581d004da6862c1be0bfed1b00fd63b88a015
tree3272be188f190ef4ab912eec63a5ea561532fb24
parentaa905182017c1d1232cb7d38b520f1bdc00ce165
parente17303933ad86fcca7762c509c8a8ecdfd252703
Merge branch 'develop' into release-0.2.16