3 Commits (40ae57d7eae3574d039c0d5ac98e6be475af8b2d)

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