down
down
Merge branch 'master' of http://github.com/sinkerplus/Actually

Conflicts:
	Actually/__init__.pyc
	Actually/settings.py
	Actually/settings.pyc
	Actually/urls.pyc
	Actually/wsgi.pyc
	Auth_App/__init__.pyc
	Auth_App/admin.pyc
	Auth_App/ajaxdata.pyc
	Auth_App/dbservice.pyc
	Auth_App/expectcal.pyc
	Auth_App/jsonservice.pyc
	Auth_App/models.pyc
	Auth_App/templatetags/__init__.pyc
	Auth_App/views.py
	Auth_App/views.pyc
down
Merge branch 'master' of http://github.com/sinkerplus/Actually

Conflicts:
	Actually/__init__.pyc
	Actually/settings.pyc
	Actually/urls.pyc
	Actually/wsgi.pyc
	Auth_App/__init__.pyc
	Auth_App/admin.pyc
	Auth_App/ajaxdata.pyc
	Auth_App/datautils.pyc
	Auth_App/dbservice.pyc
	Auth_App/expectcal.pyc
	Auth_App/jsonservice.pyc
	Auth_App/models.pyc
	Auth_App/templatetags/__init__.pyc
	Auth_App/views.pyc
Merge branch 'master' of http://github.com/sinkerplus/Actually

Conflicts:
	Actually/__init__.pyc
	Actually/settings.pyc
	Actually/wsgi.pyc
	Auth_App/__init__.pyc
	Auth_App/admin.pyc
	Auth_App/datautils.pyc
	Auth_App/models.pyc
Merge branch 'master' of http://github.com/sinkerplus/Actually

Conflicts:
	Actually/urls.pyc
	Auth_App/dbservice.pyc
	Auth_App/expectcal.pyc
	Auth_App/views.pyc