3 Commits (ad3178fe947b8d722baf5a02e77ab1a220519023)

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