3 Commits (b1f0297e8204035f39bf762d16d9c08619967988)

Author	SHA1	Message	Date
ibuler	7b792907d3	merge with dev	2015-12-19 17:27:12 +08:00
ibuler	c103738302	merge with dev	2015-12-19 17:26:34 +08:00
ibuler	412dadce76	version 2.0.0 beta	2015-04-20 10:12:11 +08:00