Merge branch 'develop'
authorZhang Xianyi <traits.zhang@gmail.com>
Wed, 3 Dec 2014 15:01:33 +0000 (23:01 +0800)
committerZhang Xianyi <traits.zhang@gmail.com>
Wed, 3 Dec 2014 15:01:33 +0000 (23:01 +0800)
commit37aee1f9b1dd16b5d27b63637deb2f40665ae059
tree8e742847be17d0c309f07e762d3f065a1916fa27
parent7e4e195e82b4940173c4b726864b3594d90c5a3a
parentf5424fc9de7238a8d1876a397dda458d864abadb
Merge branch 'develop'