Merge branch 'master' of https://github.com/MongoEngine/mongoengine

Conflicts: AUTHORS
2013-06-21 07:26:40 -04:00
parent c31d6a6898 9867e918fa
commit e0d2fab3c3
5 changed files with 74 additions and 10 deletions
--- a/1
+++ b/1
@@ -171,3 +171,4 @@ that much better:
 * Nigel McNie (https://github.com/nigelmcnie)
 * ygbourhis (https://github.com/ygbourhis)
 * Bob Dickinson (https://github.com/BobDickinson)
+ * Michael Bartnett (https://github.com/michaelbartnett)