Merge branch 'erbridge-probable_primes'
authorBen Laurie <ben@links.org>
Sun, 1 Jun 2014 14:37:08 +0000 (15:37 +0100)
committerBen Laurie <ben@links.org>
Sun, 1 Jun 2014 14:37:08 +0000 (15:37 +0100)

Trivial merge