Merge 0.9->0.10

diff --cc Makefile
index e2eca7f1dc13fcfa01fcf5c0a4344801272cdccc,46a8f49da10a9c877c82b1325fb4c330d0519a22..130d8aa7a31e7d9c423f165d0ed84ff7881bd252
--- 1/Makefile
--- 2/Makefile
+++ b/Makefile
@@@ -29,11 -29,10 +29,11 @@@ install: prosody.install prosodyctl.ins
        install -d $(SOURCE)/core $(SOURCE)/net $(SOURCE)/util
        install -m755 ./prosody.install $(BIN)/prosody
        install -m755 ./prosodyctl.install $(BIN)/prosodyctl
-       install -m644 core/* $(SOURCE)/core
+       install -m644 core/*.lua $(SOURCE)/core
        install -m644 net/*.lua $(SOURCE)/net
 -      install -d $(SOURCE)/net/http
 +      install -d $(SOURCE)/net/http $(SOURCE)/net/websocket
        install -m644 net/http/*.lua $(SOURCE)/net/http
 +      install -m644 net/websocket/*.lua $(SOURCE)/net/websocket
        install -m644 util/*.lua $(SOURCE)/util
        install -m644 util/*.so $(SOURCE)/util
        install -d $(SOURCE)/util/sasl