From 07e032a3f03d7c11435c976eec17126721cd3865 Mon Sep 17 00:00:00 2001
From: Steve Clay <steve@mrclay.org>
Date: Fri, 19 Jul 2013 22:46:02 -0400
Subject: [PATCH] Prep for 2.1.6

---
 HISTORY.txt        | 12 ++++++++++++
 min/lib/Minify.php |  6 ++++--
 2 files changed, 16 insertions(+), 2 deletions(-)

diff --git a/HISTORY.txt b/HISTORY.txt
index 0089607..9c67078 100644
--- a/HISTORY.txt
+++ b/HISTORY.txt
@@ -1,5 +1,17 @@
 Minify Release History
 
+Version 2.1.6
+    * JSMin fixes
+    * Prevents some Closure Compiler API failures
+    * Uses autoloading for all class loading
+    * Multiple group support in HTML Helper
+    * Cache adaptor for XCache
+    * Allow setting stack-size in YUI Compressor wrapper
+    * Adds jsCleanComments option to HTML minifier
+    * Upgrades CSSmin
+    * CLI script more portable
+    * Adds composer.json
+
 Version 2.1.5
     * Removed XSS vulnerability
     * Disabled builder bby default
diff --git a/min/lib/Minify.php b/min/lib/Minify.php
index c1cf797..e1a6950 100644
--- a/min/lib/Minify.php
+++ b/min/lib/Minify.php
@@ -24,7 +24,7 @@
  */
 class Minify {
     
-    const VERSION = '2.1.5';
+    const VERSION = '2.1.6';
     const TYPE_CSS = 'text/css';
     const TYPE_HTML = 'text/html';
     // there is some debate over the ideal JS Content-Type, but this is the
@@ -441,7 +441,7 @@ class Minify {
     /**
      * Set up sources to use Minify_Lines
      *
-     * @param array $sources Minify_Source instances
+     * @param Minify_Source[] $sources Minify_Source instances
      */
     protected static function _setupDebug($sources)
     {
@@ -458,6 +458,8 @@ class Minify {
      * Combines sources and minifies the result.
      *
      * @return string
+     *
+     * @throws Exception
      */
     protected static function _combineMinify()
     {