Merge branch 'master' into dev

This commit is contained in:
Feng Lee 2015-04-29 13:46:38 +08:00
commit 2db943f5e8
1 changed files with 1 additions and 1 deletions

View File

@ -27,5 +27,5 @@
{gproc, "0.4.*", {git, "git://github.com/uwiger/gproc.git", {branch, "master"}}},
{lager, ".*", {git, "git://github.com/basho/lager.git", {branch, "master"}}},
{esockd, "2.*", {git, "git://github.com/emqtt/esockd.git", {branch, "master"}}},
{mochiweb, ".*", {git, "git://github.com/slimpp/mochiweb.git", {branch, "master"}}}
{mochiweb, ".*", {git, "git://github.com/emqtt/mochiweb.git", {branch, "master"}}}
]}.