Anthony Young 80a2e15e0c Merge remote branch 'termie/explicit_api' ...

Conflicts:
	django-openstack/django_openstack/syspanel/views/images.py

2011-06-22 13:29:29 -07:00

..

views

Merge remote branch 'termie/explicit_api'

2011-06-22 13:29:29 -07:00

__init__.py

move django_openstack out of src

2011-06-22 09:47:45 -07:00

forms.py

move django_openstack out of src

2011-06-22 09:47:45 -07:00

urls.py

Merge remote branch 'termie/explicit_api'

2011-06-22 13:29:29 -07:00