From 2e94dcb6a9b5dafeea8181626c657445f788a25c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thorsten=20Bo=CC=88ttger?= <alto@mt7.de>
Date: Sat, 26 Nov 2011 00:11:30 +0100
Subject: [PATCH] providing a changelog now; updated the license

---
 CHANGELOG.md | 15 +++++++++++++++
 LICENSE      |  2 +-
 README.md    | 37 ++++++++++++++++++++++++++++++++-----
 3 files changed, 48 insertions(+), 6 deletions(-)
 create mode 100644 CHANGELOG.md

diff --git a/CHANGELOG.md b/CHANGELOG.md
new file mode 100644
index 0000000..5f21037
--- /dev/null
+++ b/CHANGELOG.md
@@ -0,0 +1,15 @@
+# CHANGELOG
+
+## 2.4.0 
+
+ * supporting new DSL (which is much shorter)
+
+## 2.3.1
+
+ * bugfix: avoid naming conflict with i18n
+
+## 2.3.0
+
+ * supporting i18n
+ * supporting regular expressions for hash values and strings
+
diff --git a/LICENSE b/LICENSE
index ccc6a79..c7d0293 100644
--- a/LICENSE
+++ b/LICENSE
@@ -1,4 +1,4 @@
-Copyright (c) 2008 Scott Barron
+Copyright (c) 2008-2011 Scott Barron
 
 Permission is hereby granted, free of charge, to any person obtaining
 a copy of this software and associated documentation files (the
diff --git a/README.md b/README.md
index 0740782..25eb937 100644
--- a/README.md
+++ b/README.md
@@ -133,13 +133,17 @@ This example uses a few of the more complex features available.
   end
 ```
 
+## Changelog ##
 
-# Other Stuff #
+Look at the [CHANGELOG](https://github.com/rubyist/aasm/blob/master/CHANGELOG.md) for details.
+
+
+## Authors ##
+
+* [Scott Barron](https://github.com/rubyist)
+* [Travis Tilley](https://github.com/ttilley)
+* [Thorsten Böttger](http://github.com/alto),
 
-Author::  Scott Barron <scott at elitists dot net>
-License:: Original code Copyright 2006, 2007, 2008 by Scott Barron.
-          Released under an MIT-style license.  See the LICENSE  file
-          included in the distribution.
 
 ## Warranty ##
 
@@ -147,3 +151,26 @@ This software is provided "as is" and without any express or
 implied warranties, including, without limitation, the implied
 warranties of merchantibility and fitness for a particular
 purpose.
+
+## License ##
+
+Copyright (c) 2006-2011 Scott Barron
+
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of this software and associated documentation files (the
+"Software"), to deal in the Software without restriction, including
+without limitation the rights to use, copy, modify, merge, publish,
+distribute, sublicense, and/or sell copies of the Software, and to
+permit persons to whom the Software is furnished to do so, subject to
+the following conditions:
+
+The above copyright notice and this permission notice shall be
+included in all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.