2 Commits (cad7a193b32a2ee2a7a12eaed0a63a8b92f1e3fe)

Author	SHA1	Message	Date
ibuler	7be7772af6	修复授权修改显示ip	2015-12-30 15:38:28 +08:00
ibuler	7b792907d3	merge with dev	2015-12-19 17:27:12 +08:00