From 79c9c410f49c50c4c2c3bc1135ffb62f8d18a710 Mon Sep 17 00:00:00 2001
From: Kevin Olbrich <kolbrich@6fusion.com>
Date: Sun, 16 Sep 2012 11:17:15 -0400
Subject: [PATCH] update change log and version

---
 CHANGELOG.txt | 4 ++++
 VERSION       | 2 +-
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/CHANGELOG.txt b/CHANGELOG.txt
index dc5748b2..e868ebc7 100644
--- a/CHANGELOG.txt
+++ b/CHANGELOG.txt
@@ -1,5 +1,9 @@
 Change Log for Ruby-units
 =========================
+2012-09-16  1.4.2   * Fix issue #54 -- pluralization of fluid-ounces
+                    * Fix issue #53, 51 -- incorrect definition for gee
+                    * Fix issue #52 -- add support for degree symbol
+                    * Fix issue #50 -- fix conversion to json
 2012-05-13  1.4.1   * Fix issue #40 -- Unit parsing truncates invalid portions of the unit
                     * Fix issue #41 -- initializing with a nil gives unexpected result
 2012-02-01          * Fix issue #34 -- Time.at takes more than one parameter
diff --git a/VERSION b/VERSION
index 13175fdc..c9929e36 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-1.4.1
\ No newline at end of file
+1.4.2
\ No newline at end of file