From d3431892ab6f47cf41c70d5f99224b020834665e Mon Sep 17 00:00:00 2001
From: hwmaier <hwmaier@gmail.com>
Date: Wed, 11 Feb 2015 21:55:33 +1000
Subject: [PATCH 1/3] Fixed bug with $config->scripts support for JS() method

---
 AllInOneMinify.module | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/AllInOneMinify.module b/AllInOneMinify.module
index 597c03c..5416d33 100644
--- a/AllInOneMinify.module
+++ b/AllInOneMinify.module
@@ -419,7 +419,7 @@ class AllInOneMinify extends WireData implements Module, ConfigurableModule {
 
         // Support passing of $config->scripts as argument which is of type FilenameArray
         if(($javascripts instanceof FilenameArray))
-            $stylesheets = (array) $javascripts->getIterator(); // Convert to array
+            $javascripts = (array) $javascripts->getIterator(); // Convert to array
 
         // ------------------------------------------------------------------------
         // Check if files exist and generating the cache file name based 

From e7c3b4347b11ed7c40eff4a1fc46ad82cc19d157 Mon Sep 17 00:00:00 2001
From: marvinscharle <marvin.scharle@conclurer.com>
Date: Wed, 11 Feb 2015 13:42:56 +0100
Subject: [PATCH 2/3] Merge branch 'pr/19' into AIOM-3.2.1

---
 lib/Less/Less.php | 1 +
 1 file changed, 1 insertion(+)

diff --git a/lib/Less/Less.php b/lib/Less/Less.php
index b70784e..b37f141 100644
--- a/lib/Less/Less.php
+++ b/lib/Less/Less.php
@@ -2040,6 +2040,7 @@ private function parseDirective(){
                 $hasBlock = false;
                 break;
             case "@keyframes":
+            case "@-webkit-keyframes":
                 $hasIdentifier = true;
                 break;
             case "@host":

From cc77ebfb2b6f2fe3f6790c711874709552d03d89 Mon Sep 17 00:00:00 2001
From: marvinscharle <marvin.scharle@conclurer.com>
Date: Wed, 11 Feb 2015 13:48:30 +0100
Subject: [PATCH 3/3] Update to Version 3.2.1

- Includes a fix that caused an incorrect usage of $config->scripts
(#36)
- Adds support for @-webkit-keyframes CSS properties (#19)
---
 AllInOneMinify.module | 2 +-
 README.md             | 5 +++++
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/AllInOneMinify.module b/AllInOneMinify.module
index 5416d33..a66665c 100644
--- a/AllInOneMinify.module
+++ b/AllInOneMinify.module
@@ -68,7 +68,7 @@ class AllInOneMinify extends WireData implements Module, ConfigurableModule {
             // ------------------------------------------------------------------------
             // Version: major, minor, revision, i.e. 100 = 1.1.0
             // ------------------------------------------------------------------------
-            'version' => 320,
+            'version' => 321,
 
             'author' => 'David Karich & Conclurer GbR',
 
diff --git a/README.md b/README.md
index 70640b4..baace4c 100644
--- a/README.md
+++ b/README.md
@@ -161,6 +161,11 @@ If you are currently in development of the site, caching can be a problem. For t
 
 ##Changelog##
 
+3.2.1
+
+* Bugfix: $config->scripts was not included properly
+* Support for @-webkit-keyframes added
+
 3.2
 
 * New CSS Compressor: AIOM now uses YUI Compressor (thanks to hwmaier)