Richard Jaldin L 4af535b9e6 Merge branch 'master' of git@github.com:DiUS/java-faker.git ...

Conflicts:
	src/main/java/com/github/javafaker/Faker.java

Signed-off-by: Richard Jaldin L <richard.jaldin@trueforce.com>

2014-06-24 09:15:38 -04:00

..

javafaker

Merge branch 'master' of git@github.com:DiUS/java-faker.git

2014-06-24 09:15:38 -04:00