[#74] Merge with master.

README.md

@@ -7,6 +7,14 @@ This is a work in progress. There's also [an article](http://marcelog.github.com
 simple persistance layer capable of interacting with different db's, while
 offering a consistent api to your code.
 
+# Contact Us
+For **questions** or **general comments** regarding the use of this library, please use our public
+[hipchat room](https://www.hipchat.com/gpBpW3SsT).
+
+If you find any **bugs** or have a **problem** while using this library, please [open an issue](https://github.com/inaka/sumo_db/issues/new) in this repo (or a pull request :)).
+
+And you can check all of our open-source projects at [inaka.github.io](http://inaka.github.io)
+
 # Overview
  * sumo_db gives you a standard way to define your db schema, no matter the
  db implementation (mongo, mysql, redis, or sqlite3).

rebar.config

@@ -20,9 +20,9 @@
 ]}.
 {deps, [
   {'lager',     ".*",  {git, "git://github.com/basho/lager.git",          "2.0.3"}},
-  {emysql,      "0.*", {git, "[email protected]:Eonblast/Emysql.git",        "master"}},
-  {emongo,      ".*",  {git, "[email protected]:marcelog/emongo.git",        "marcelog_login_for_2_2_and_higher"}},
-  {'sqlite3',   ".*",  {git, "[email protected]:alexeyr/erlang-sqlite3.git", "HEAD"}},
+  {emysql,      "0.*", {git, "[email protected]:Eonblast/Emysql.git",        "v0.4.1"}},
+  {emongo,      ".*",  {git, "[email protected]:inaka/emongo.git",           "v0.2.1"}},
+  {'sqlite3',   ".*",  {git, "[email protected]:alexeyr/erlang-sqlite3.git", "v1.0.1"}},
   {'tirerl',    ".*",  {git, "[email protected]:inaka/tirerl",               "0.1.0"}},
   {worker_pool, ".*",  {git, "[email protected]:inaka/worker_pool.git",      "1.0"}}
 ]}.

src/sumo_repo_mysql.erl

@@ -394,7 +394,7 @@ prepare(DocName, PreName, Fun) when is_atom(PreName), is_function(Fun) ->
 %% @doc Call prepare/3 first, to get a well formed statement name.
 execute(Name, Args, #state{pool=Pool}) when is_atom(Name), is_list(Args) ->
   {Time, Value} = timer:tc( emysql, execute, [Pool, Name, Args] ),
-  log("Executed Query: ~s -> ~p (~pms)", [Name, Args, Time]),
+  log("Executed Query: ~s -> ~p (~pms)", [Name, Args, Time/1000]),
   Value.
 
 execute(Name, State) when is_atom(Name) ->