Feng Lee 5b36d1b677 Merge branch 'master' into dev		2015-05-28 10:07:18 +08:00
..
include	mod presence	2015-05-27 15:32:04 +08:00
priv/www	fix websocket url	2015-05-28 09:45:37 +08:00
src	rm plguins/emqttd_auth_plugins	2015-05-28 01:11:36 +08:00
test	access test	2015-05-20 12:48:34 +08:00