From 060ccb3914ac728f2d525731558976bffdd61d5c Mon Sep 17 00:00:00 2001
From: Mike Dvorkin <mike@dvorkin.net>
Date: Tue, 11 Sep 2012 16:11:27 -0700
Subject: [PATCH] Updated CHANGELOG

---
 CHANGELOG | 11 +++++++++++
 LICENSE   |  2 +-
 README.md |  2 +-
 3 files changed, 13 insertions(+), 2 deletions(-)

diff --git a/CHANGELOG b/CHANGELOG
index 2b06c70..8d8796c 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,3 +1,14 @@
+1.1.0
+  - Objects are no longer recursively formatted by default. Reenable by using :raw => true option.
+  - ap(object) now returns nil when running under IRB or Pry
+  - Added support for Mongoid 3 and Moped (Nikolaj Nikolajsen)
+  - Improved formatting of MongoMapper objects (George .)
+  - ActiveRecord::Relation now renders as array (Dan Lynn)
+  - Formatting BigDecimal no longer looses precision (Evan Senter)
+  - Added AwesomePrint.irb! and AwesomePrint.pry! convenience methods
+  - Fixed conflict with the colorize gem
+  - Misc tweaks and bug fixes
+
 1.0.2
   - Added formatting of Mongoid documents (Adam Doppelt)
   - ActiveRecord objects display attributes only. Use :raw => true to display the entire object
diff --git a/LICENSE b/LICENSE
index d62077e..d402d4a 100644
--- a/LICENSE
+++ b/LICENSE
@@ -1,5 +1,5 @@
 Copyright (c) 2010-2012 Michael Dvorkin
-twitter.com/mid
+http://www.dvorkin.net
 %w(mike dvorkin.net) * "@" || %w(mike fatfreecrm.com) * "@"
 
 Permission is hereby granted, free of charge, to any person obtaining
diff --git a/README.md b/README.md
index bfd0b25..dc2b87f 100644
--- a/README.md
+++ b/README.md
@@ -325,7 +325,7 @@ For example:
 ### License ###
 Copyright (c) 2010-2012 Michael Dvorkin
 
-twitter.com/mid
+http://www.dvorkin.net
 
 %w(mike dvorkin.net) * "@" || %w(mike fatfreecrm.com) * "@"