Merge branch 'upstream-master' into dev

hibari · Nov 9, 2015 · a1da413 · a1da413
2 parents 63b3d53 + ae5048f
commit a1da413
Showing 1 changed file with 1 addition and 1 deletion.
diff --git a/test/unit/irc_plugin.erl b/test/unit/irc_plugin.erl
@@ -203,7 +203,7 @@ random_nick(N) ->
     [$a + random:uniform(26) - 1|random_nick(N-1)].
 
 new_seed() ->
-    {_,_,X} = erlang:now(),
+    {_,_,X} = os:timestamp(),
     {H,M,S} = time(),
     H1 = H * X rem 32767,
     M1 = M * X rem 32767,