Unified db, file and cdn in one branch
Added cdn helper methods from other branch
Increased version
Added default values for storage option
Create composer.json
Adding tstamp to assets (fixes #3)
Increase version
Merge pull request #2 from vinai-drive-by-commits/master

Add composer.json
Update magento-composer-installer dependency to "*"
Merge branch 'master' of github.com:fbrnc/Aoe_JsCssTstamp
Merge pull request #5 from vinai-drive-by-commits/master

Update composer.json
Update readme.txt

adding nginx rewrite rules
making nginx rewrite more generic

it appears the module will add timestamps to assets not in the skin folder as well making the rewrite generic for the whole site will cover these edge cases - most notably arrows and icons within magento admin
Merge pull request #7 from anthonysomerset/nginx-rewrites

adding Nginx rewrite rules
Making changes to bring this branch in-line with the AOE version for a merge
Merge branch 'fbrnc-master' into aoe-master

Conflicts:
	app/code/local/Aoe/JsCssTstamp/Model/Package.php
	app/code/local/Aoe/JsCssTstamp/etc/config.xml
	app/code/local/Aoe/JsCssTstamp/etc/system.xml
Making target filename protocol specific
Bump version number