Jannis Leidel 55acb2da06 Merge remote branch 'muhuk/master' ...

Conflicts:
	compressor/__init__.py
	tests/core/tests.py

2010-02-23 13:42:57 +01:00

..

__init__.py

Initial commit (includes bits from django-compress)

2009-04-24 16:02:20 -05:00

models.py

Initial commit (includes bits from django-compress)

2009-04-24 16:02:20 -05:00

tests.py

Merge remote branch 'muhuk/master'

2010-02-23 13:42:57 +01:00