Permalink
Browse files

Merge branch 'master' of github.com:vznet/play-mongo-jackson-mapper

Conflicts:
	README.markdown
  • Loading branch information...
2 parents bf59d54 + 76b3acb commit 3d65cd84150530d2e412a9cef19998b8d5b495c5 @jroper jroper committed Apr 8, 2012
Showing with 0 additions and 0 deletions.

0 comments on commit 3d65cd8

Please sign in to comment.