merge with origin done

2014-07-07 21:59:42 +02:00
parent a8e4554fec c6e846e0ae
commit 03fe431f1a
6 changed files with 58 additions and 29 deletions
--- a/docs/changelog.rst
+++ b/docs/changelog.rst
@@ -6,6 +6,8 @@ Changelog
 Changes in 0.9.X - DEV
 ======================
 - Added support to show original model fields on to_json calls instead of db_field #697
+- Fixed tests for Django 1.7 #696
+- Follow ReferenceFields in EmbeddedDocuments with select_related #690
 - Added preliminary support for text indexes #680
 - Added `elemMatch` operator as well - `match` is too obscure #653
 - Added support for progressive JPEG #486 #548