3 Commits (3248ee1a3d441d42286a98df9f924abd67d216b4)

Author	SHA1	Message	Date
ibuler	c36267dc17	rebase version	2015-12-20 19:09:18 +08:00
ibuler	b7eb95f85f	修复安装bug	2015-12-20 17:45:57 +08:00
ibuler	7b792907d3	merge with dev	2015-12-19 17:27:12 +08:00