Merge branch 'master' into emq20

Makefile

@@ -9,7 +9,7 @@ dep_goldrush     = git https://github.com/basho/goldrush 0.1.9
 dep_gproc        = git https://github.com/uwiger/gproc
 dep_getopt       = git https://github.com/jcomellas/getopt v0.8.2
 dep_lager        = git https://github.com/basho/lager master
-dep_esockd       = git https://github.com/emqtt/esockd emq20
+dep_esockd       = git https://github.com/emqtt/esockd v4.2
 dep_mochiweb     = git https://github.com/emqtt/mochiweb
 dep_pbkdf2       = git https://github.com/emqtt/pbkdf2 2.0.1
 dep_lager_syslog = git https://github.com/basho/lager_syslog

rebar.lock

@@ -1,6 +1,6 @@
 [{<<"esockd">>,
   {git,"https://github.com/emqtt/esockd",
-       {ref,"6ef597f16ce242fe37ae019d6ff5214f7a784c80"}},
+       {ref,"87d0d3b672e0f25e474f5f8298da568cbb6b168a"}},
   0},
  {<<"gen_logger">>,
   {git,"https://github.com/emqtt/gen_logger.git",
@@ -24,7 +24,11 @@
   0},
  {<<"mochiweb">>,
   {git,"https://github.com/emqtt/mochiweb",
-       {ref,"af27c0c90bf4c1bfeae0290e4c541264b69f7168"}},
+       {ref,"c75d88e451b4fe26580a58223f645d99482f51af"}},
+  0},
+ {<<"pbkdf2">>,
+  {git,"https://github.com/comtihon/erlang-pbkdf2.git",
+       {ref,"7076584f5377e98600a7e2cb81980b2992fb2f71"}},
   0},
  {<<"syslog">>,
   {git,"git://github.com/Vagabond/erlang-syslog",