[commit: packages/random] master: Merge remote-tracking branch 'remotes/downstream/master' (dcb3972)

[git at git.haskell.org]

Repository : ssh://git@git.haskell.org/random

On branch  : master
Link       : http://git.haskell.org/packages/random.git/commitdiff/dcb39721a9f9e3bc946b12fc1adc0085e402c1d5

>---------------------------------------------------------------

commit dcb39721a9f9e3bc946b12fc1adc0085e402c1d5
Merge: a42da67 180aa65
Author: Ryan Newton <rrnewton at gmail.com>
Date:   Fri Mar 28 15:53:29 2014 -0400

    Merge remote-tracking branch 'remotes/downstream/master'
    
    Conflicts:
    	.gitignore



>---------------------------------------------------------------

dcb39721a9f9e3bc946b12fc1adc0085e402c1d5
 .gitignore   | 7 ++++++-
 random.cabal | 2 +-
 tests/all.T  | 2 +-
 3 files changed, 8 insertions(+), 3 deletions(-)